[Box Backup-commit] COMMIT r1003 - box/trunk/test/backupdiff
boxbackup-dev@fluffy.co.uk
boxbackup-dev@fluffy.co.uk
Thu, 12 Oct 2006 23:22:06 +0100
Author: chris
Date: 2006-10-12 23:22:05 +0100 (Thu, 12 Oct 2006)
New Revision: 1003
Modified:
box/trunk/test/backupdiff/testbackupdiff.cpp
Log:
This test takes a long time on Win32 (slow file access? VMware?), so:
* Disable verbose debug logging, which makes it even slower
* Print a warning before the slow test starts
* Increase timeout
Modified: box/trunk/test/backupdiff/testbackupdiff.cpp
===================================================================
--- box/trunk/test/backupdiff/testbackupdiff.cpp 2006-10-12 22:21:32 UTC (rev 1002)
+++ box/trunk/test/backupdiff/testbackupdiff.cpp 2006-10-12 22:22:05 UTC (rev 1003)
@@ -369,8 +369,10 @@
{
// Want to trace out all the details
#ifndef NDEBUG
+ #ifndef WIN32
BackupStoreFile::TraceDetailsOfDiffProcess = true;
#endif
+ #endif
// Create all the test files
create_test_files();
@@ -503,8 +505,15 @@
// 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");
@@ -524,7 +533,14 @@
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");