summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2006-09-02 10:51:41 +0000
committerChris Wilson <chris+github@qwirx.com>2006-09-02 10:51:41 +0000
commitaae9bedf46cd180f89a961d2cc77cf6c7fcc3055 (patch)
tree89441d18a1132628cfcbf3f23a220d33ed4d2d3b
parentda1adc8d421d8923792a0ab8c60f29cbbd5ca2c8 (diff)
(refs #3)
Remove newlines from output to avoid failure to recognise it on Win32
-rwxr-xr-xtest/backupstorefix/testfiles/testbackupstorefix.pl.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/backupstorefix/testfiles/testbackupstorefix.pl.in b/test/backupstorefix/testfiles/testbackupstorefix.pl.in
index b57f10ac..e64474f0 100755
--- a/test/backupstorefix/testfiles/testbackupstorefix.pl.in
+++ b/test/backupstorefix/testfiles/testbackupstorefix.pl.in
@@ -54,7 +54,7 @@ elsif($ARGV[0] eq 'check')
open INITIAL,'testfiles/initial-listing.txt' or die "Can't open original listing";
while(<INITIAL>)
{
- chomp;
+ chomp; s/\r//;
$expected{$_} = 1;
m/\A(.+?) .+? (.+)\Z/;
$filenames{$2} = $_;
@@ -99,7 +99,7 @@ elsif($ARGV[0] eq 'check')
while(<LISTING>)
{
print LISTING_COPY;
- chomp;
+ chomp; s/\r//;
s/\[FILENAME NOT ENCRYPTED\]//;
if(exists $expected{$_})
{