Changeset 2460 for box/trunk/test

Timestamp:

21/03/2009 18:48:19 (3 years ago)

Author:

chris

Message:

Fix tests (hopefully) on Win32 for struct stat ino_t change from 16 to
64 bits.

File:

• box/trunk/test/bbackupd/testbbackupd.cpp (modified) (4 diffs)

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -259 +259 @@
 bool attrmatch(const char *f1, const char *f2)
 {
-        struct stat s1, s2;
-        TEST_THAT(::lstat(f1, &s1) == 0);
-        TEST_THAT(::lstat(f2, &s2) == 0);
+        EMU_STRUCT_STAT s1, s2;
+        TEST_THAT(EMU_LSTAT(f1, &s1) == 0);
+        TEST_THAT(EMU_LSTAT(f2, &s2) == 0);
 
 #ifdef HAVE_SYS_XATTR_H
@@ -2028 +2028 @@
                         "their contents can be restored.\n");
 
+                int compareReturnValue;
+
                 {
                         #ifdef WIN32
@@ -2040 +2042 @@
                         wait_for_sync_end(); // should be backed up now
 
-                        int compareReturnValue = ::system(BBACKUPQUERY " "
+                        compareReturnValue = ::system(BBACKUPQUERY " "
                                 "-Wwarning "
                                 "-c testfiles/bbackupd.conf "
@@ -2083 +2085 @@
 
                 }
-
-                int compareReturnValue;
 
 #ifdef WIN32