summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2015-02-23 22:26:10 +0000
committerChris Wilson <chris+github@qwirx.com>2015-02-23 22:26:10 +0000
commitca4e4572ca51cce442add6107a59075f76b3aecd (patch)
tree00e85fb362e27d5b7963f4ffa04dd339722dd4af /test
parent1a02ae4abc992a5765780aea7a2a924cc96a0a12 (diff)
Fix test failure caused by logging fd change.
Logging everything to stdout (so that Windows users can redirect it) causes extra output on stdout that confused the Perl script for this test.
Diffstat (limited to 'test')
-rwxr-xr-xtest/backupstorefix/testfiles/testbackupstorefix.pl.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/backupstorefix/testfiles/testbackupstorefix.pl.in b/test/backupstorefix/testfiles/testbackupstorefix.pl.in
index d724946e..a290a517 100755
--- a/test/backupstorefix/testfiles/testbackupstorefix.pl.in
+++ b/test/backupstorefix/testfiles/testbackupstorefix.pl.in
@@ -105,6 +105,7 @@ elsif($ARGV[0] eq 'check')
print LISTING_COPY;
chomp; s/\r//;
s/ \[FILENAME NOT ENCRYPTED\]//;
+ next if /^WARNING: \*\*\*\* BackupStoreFilename encoded with Clear encoding \*\*\*\*/;
if(exists $expected{$_})
{
delete $expected{$_}
@@ -142,6 +143,7 @@ elsif($ARGV[0] eq 'reroot')
print LISTING_COPY;
chomp;
s/\[FILENAME NOT ENCRYPTED\]//;
+ next if /^WARNING: \*\*\*\* BackupStoreFilename encoded with Clear encoding \*\*\*\*/;
my ($id,$type,$name) = split / /;
$count++;
if($name !~ /\Alost\+found0/)