diff options
author | Chris Wilson <chris+github@qwirx.com> | 2008-01-23 20:14:37 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2008-01-23 20:14:37 +0000 |
commit | e7469fe7c509ff484ddd1d0f884c4ba6d1c6041c (patch) | |
tree | 3eee06e7bd7db9ca4f1ea4b8c862a377a2c1d137 | |
parent | b70df10f8b5b9e4d7efb4f0c9afcaaccf6138b76 (diff) |
Ignore terminal type error messages from bbackupquery, may happen
in Debian buildds.
-rwxr-xr-x | test/bbackupd/testfiles/extcheck1.pl.in | 11 | ||||
-rwxr-xr-x | test/bbackupd/testfiles/extcheck2.pl.in | 12 |
2 files changed, 18 insertions, 5 deletions
diff --git a/test/bbackupd/testfiles/extcheck1.pl.in b/test/bbackupd/testfiles/extcheck1.pl.in index 2a7c0e9a..4d0f2157 100755 --- a/test/bbackupd/testfiles/extcheck1.pl.in +++ b/test/bbackupd/testfiles/extcheck1.pl.in @@ -15,7 +15,9 @@ my $seen = 0; while(<IN>) { next unless m/\S/; - if(m/continousupdate/) + print "READ: $_"; + + if (m/continousupdate/) { unless (/exists/) { @@ -24,6 +26,12 @@ while(<IN>) } $seen = 1; } + elsif (m/^No entry for terminal type/ or + m/^using dumb terminal settings/) + { + # skip these lines, may happen in Debian buildd + # with no terminal. + } else { unless (/\AWARNING/ or /\ADifferences/ or /might be reason/ @@ -33,7 +41,6 @@ while(<IN>) $ret = 2; } } - print "READ: $_"; } close IN; diff --git a/test/bbackupd/testfiles/extcheck2.pl.in b/test/bbackupd/testfiles/extcheck2.pl.in index c79bf414..074defc0 100755 --- a/test/bbackupd/testfiles/extcheck2.pl.in +++ b/test/bbackupd/testfiles/extcheck2.pl.in @@ -14,7 +14,9 @@ my $ret = 1; while(<IN>) { next unless m/\S/; - if(m/continousupdate/) + print "READ: $_"; + + if (m/continousupdate/) { unless (m/contents/ or m/attributes/) { @@ -22,6 +24,12 @@ while(<IN>) $ret = 2; } } + elsif (m/^No entry for terminal type/ or + m/^using dumb terminal settings/) + { + # skip these lines, may happen in Debian buildd + # with no terminal. + } else { unless (/\AWARNING/ or /\ADifferences/ or /might be reason/ @@ -31,8 +39,6 @@ while(<IN>) $ret = 2; } } - - print "READ: $_"; } close IN; |