[Box Backup-commit] COMMIT r1004 - box/trunk/test/backupdiff

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-10-12 23:22:39 +0100 (Thu, 12 Oct 2006)
New Revision: 1004

Modified:
   box/trunk/test/backupdiff/testbackupdiff.cpp
Log:
 * Reverted, oops!


Modified: box/trunk/test/backupdiff/testbackupdiff.cpp
===================================================================
--- box/trunk/test/backupdiff/testbackupdiff.cpp	2006-10-12 22:22:05 UTC (rev 1003)
+++ box/trunk/test/backupdiff/testbackupdiff.cpp	2006-10-12 22:22:39 UTC (rev 1004)
@@ -369,10 +369,8 @@
 {
 	// Want to trace out all the details
 	#ifndef NDEBUG
-	#ifndef WIN32
 	BackupStoreFile::TraceDetailsOfDiffProcess = true;
 	#endif
-	#endif
 
 	// Create all the test files
 	create_test_files();
@@ -505,15 +503,8 @@
 	// suck up lots of processor time -- because of lots of matches 
 	// found. Check this out!
 
-	#ifdef WIN32
-	::fprintf(stdout, "Testing diffing two large streams, "
-		"may take a while!\n");
-	::fflush(stdout);
-	#endif
-
 	make_file_of_zeros("testfiles/zero.0", 20*1024*1024);
 	make_file_of_zeros("testfiles/zero.1", 200*1024*1024);
-
 	// Generate a first encoded file
 	{
 		BackupStoreFilenameClear f0name("zero.0");
@@ -533,14 +524,7 @@
 			2000 /* object ID of the file diffing from */, blockindex, IOStream::TimeOutInfinite,
 			0, 0));
 		encoded->CopyStreamTo(out);
-
-		printf("Time taken: %d seconds\n", (int)(time(0) - beginTime));
-
-		#ifdef WIN32
-		TEST_THAT(time(0) < (beginTime + 300));
-		#else
 		TEST_THAT(time(0) < (beginTime + 40));
-		#endif
 	}
 	// Remove zero-files to save disk space
 	remove("testfiles/zero.0");