Changeset 2135

Timestamp:

05/04/2008 01:55:32 (4 years ago)

Author:

chris

Message:

Improve debugging when failing to create the large file for diff speed
tests. (merges [1946])

File:

• box/trunk/test/backupdiff/testbackupdiff.cpp (modified) (4 diffs)

box/trunk/test/backupdiff/testbackupdiff.cpp

@@ -65 +65 @@
 }
 
-void make_file_of_zeros(const char *filename, size_t size)
+bool make_file_of_zeros(const char *filename, size_t size)
 {
         #ifdef WIN32
@@ -76 +76 @@
         if (result != TRUE)
         {
-                printf("Error %u\n", GetLastError());
+                BOX_ERROR("Failed to create large file " << filename <<
+                        " (" << (size >> 20) << " MB): " <<
+                        GetErrorMessage(GetLastError()));
         }
         TEST_THAT(result == TRUE);
@@ -88 +90 @@
         #endif
 
-        TEST_THAT((size_t)TestGetFileSize(filename) == size);
+        bool correct_size = ((size_t)TestGetFileSize(filename) == size);
+        TEST_THAT(correct_size);
+        if (!correct_size)
+        {
+                BOX_ERROR("Failed to create large file " << filename <<
+                        " (" << (size >> 20) << " MB): " <<
+                        "got " << (TestGetFileSize(filename) >> 20) <<
+                        " MB instead");
+        }
+        return correct_size;
 }
 
@@ -516 +527 @@
 
         #ifdef WIN32
-        ::fprintf(stdout, "Testing diffing two large streams, "
-                "may take a while!\n");
-        ::fflush(stdout);
+        BOX_WARNING("Testing diffing two large streams, may take a while!");
+        ::fflush(stderr);
         #endif
 
-        make_file_of_zeros("testfiles/zero.0", 20*1024*1024);
-        make_file_of_zeros("testfiles/zero.1", 200*1024*1024);
+        if (!make_file_of_zeros("testfiles/zero.0", 20*1024*1024))
+        {
+                return 1;
+        }
+
+        if (!make_file_of_zeros("testfiles/zero.1", 200*1024*1024))
+        {
+                remove("testfiles/zero.0");
+                return 1;
+        }
 
         // Generate a first encoded file