From ca4e4572ca51cce442add6107a59075f76b3aecd Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 23 Feb 2015 22:26:10 +0000 Subject: 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. --- test/backupstorefix/testfiles/testbackupstorefix.pl.in | 2 ++ 1 file changed, 2 insertions(+) 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/) -- cgit v1.2.3