[Box Backup-commit] COMMIT r1104 - box/trunk/test/backupstorefix/testfiles

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-10-27 19:58:33 +0100 (Fri, 27 Oct 2006)
New Revision: 1104

Modified:
   box/trunk/test/backupstorefix/testfiles/testbackupstorefix.pl.in
Log:
Remove newlines from output to avoid failure to recognise it on Win32.


Modified: box/trunk/test/backupstorefix/testfiles/testbackupstorefix.pl.in
===================================================================
--- box/trunk/test/backupstorefix/testfiles/testbackupstorefix.pl.in	2006-10-27 18:57:43 UTC (rev 1103)
+++ box/trunk/test/backupstorefix/testfiles/testbackupstorefix.pl.in	2006-10-27 18:58:33 UTC (rev 1104)
@@ -54,7 +54,7 @@
 	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 @@
 	while(<LISTING>)
 	{
 		print LISTING_COPY;
-		chomp;
+		chomp; s/\r//;
 		s/\[FILENAME NOT ENCRYPTED\]//;
 		if(exists $expected{$_})
 		{