summaryrefslogtreecommitdiff
path: root/test/backupstorefix/testfiles/testbackupstorefix.pl.in
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2019-05-28 07:20:50 -0400
committerReinhard Tartler <siretart@tauware.de>2019-05-28 07:20:50 -0400
commitb370dc014446dfe1ea9b8926d13dc8ec643f33b9 (patch)
tree95f1c8cb423c894e75ce0b27b50f56ffdd2fc7e4 /test/backupstorefix/testfiles/testbackupstorefix.pl.in
parente9db5f7277a85068ef9e5515adf8577f74814d5e (diff)
parent6017757bc079f4446aa77bc5c0855c52741280f4 (diff)
Update upstream source from tag 'upstream/0.13__git20190527.g039c4a1'
Update to upstream version '0.13~~git20190527.g039c4a1' with Debian dir 2f67398c74e85067e31e6bf62658e5870a79e436
Diffstat (limited to 'test/backupstorefix/testfiles/testbackupstorefix.pl.in')
-rwxr-xr-xtest/backupstorefix/testfiles/testbackupstorefix.pl.in16
1 files changed, 9 insertions, 7 deletions
diff --git a/test/backupstorefix/testfiles/testbackupstorefix.pl.in b/test/backupstorefix/testfiles/testbackupstorefix.pl.in
index fc807155..483087f7 100755
--- a/test/backupstorefix/testfiles/testbackupstorefix.pl.in
+++ b/test/backupstorefix/testfiles/testbackupstorefix.pl.in
@@ -148,18 +148,20 @@ elsif($ARGV[0] eq 'reroot')
or die "can't open copy listing file";
my $err = 0;
my $count = 0;
- while(<LISTING>)
+ while(my $line = <LISTING>)
{
- print LISTING_COPY;
- chomp;
- s/\[FILENAME NOT ENCRYPTED\]//;
- next if /^WARNING: \*\*\*\* BackupStoreFilename encoded with Clear encoding \*\*\*\*/;
- my ($id,$type,$name) = split / /;
+ print LISTING_COPY $line;
+ chomp $line;
+ $line =~s/\[FILENAME NOT ENCRYPTED\]//;
+ next if $line =~ /^WARNING: \*\*\*\* BackupStoreFilename encoded with Clear encoding \*\*\*\*/;
+ next if $line =~ /^WARNING: SSLSecurityLevel not set./;
+ my ($id,$type,$name) = split / /, $line;
$count++;
if($name !~ /\Alost\+found0/)
{
# everything must be in a lost and found dir
- $err = 1
+ print "Expected '$name' to be in a lost+found directory, but it was not ($line)";
+ $err = 1;
}
}
close LISTING_COPY;