Changeset 1908

Timestamp:

04/11/2007 03:24:11 (5 years ago)

Author:

chris

Message:

Move sync helper functions from test/bbackupd to Test.h to share with
other tests, particularly test/backupstorefix.

Location:

box/trunk

Files:

• lib/common/Test.h (modified) (2 diffs)
• test/bbackupd/testbbackupd.cpp (modified) (1 diff)

box/trunk/lib/common/Test.h

@@ -24 +24 @@
 
 #include <string>
+
+#ifdef WIN32
+#define BBACKUPCTL      "..\\..\\bin\\bbackupctl\\bbackupctl.exe"
+#define BBACKUPD        "..\\..\\bin\\bbackupd\\bbackupd.exe"
+#define BBSTORED        "..\\..\\bin\\bbstored\\bbstored.exe"
+#define BBACKUPQUERY    "..\\..\\bin\\bbackupquery\\bbackupquery.exe"
+#define BBSTOREACCOUNTS "..\\..\\bin\\bbstoreaccounts\\bbstoreaccounts.exe"
+#define TEST_RETURN(actual, expected) TEST_THAT(actual == expected);
+#else
+#define BBACKUPCTL      "../../bin/bbackupctl/bbackupctl"
+#define BBACKUPD        "../../bin/bbackupd/bbackupd"
+#define BBSTORED        "../../bin/bbstored/bbstored"
+#define BBACKUPQUERY    "../../bin/bbackupquery/bbackupquery"
+#define BBSTOREACCOUNTS "../../bin/bbstoreaccounts/bbstoreaccounts"
+#define TEST_RETURN(actual, expected) TEST_THAT(actual == expected*256);
+#endif
 
 extern int failures;
@@ -354 +370 @@
 }
 
-#ifdef WIN32
-#define BBACKUPCTL      "..\\..\\bin\\bbackupctl\\bbackupctl.exe"
-#define BBACKUPD        "..\\..\\bin\\bbackupd\\bbackupd.exe"
-#define BBSTORED        "..\\..\\bin\\bbstored\\bbstored.exe"
-#define BBACKUPQUERY    "..\\..\\bin\\bbackupquery\\bbackupquery.exe"
-#define BBSTOREACCOUNTS "..\\..\\bin\\bbstoreaccounts\\bbstoreaccounts.exe"
-#define TEST_RETURN(actual, expected) TEST_THAT(actual == expected);
-#else
-#define BBACKUPCTL      "../../bin/bbackupctl/bbackupctl"
-#define BBACKUPD        "../../bin/bbackupd/bbackupd"
-#define BBSTORED        "../../bin/bbstored/bbstored"
-#define BBACKUPQUERY    "../../bin/bbackupquery/bbackupquery"
-#define BBSTOREACCOUNTS "../../bin/bbstoreaccounts/bbstoreaccounts"
-#define TEST_RETURN(actual, expected) TEST_THAT(actual == expected*256);
-#endif
+inline void force_sync()
+{
+        TEST_THAT(::system(BBACKUPCTL " -q -c testfiles/bbackupd.conf "
+                "force-sync") == 0);
+        TestRemoteProcessMemLeaks("bbackupctl.memleaks");
+}
+
+inline void wait_for_sync_start()
+{
+        TEST_THAT(::system(BBACKUPCTL " -q -c testfiles/bbackupd.conf "
+                "wait-for-sync") == 0);
+        TestRemoteProcessMemLeaks("bbackupctl.memleaks");
+}
+
+inline void wait_for_sync_end()
+{
+        TEST_THAT(::system(BBACKUPCTL " -q -c testfiles/bbackupd.conf "
+                "wait-for-end") == 0);
+        TestRemoteProcessMemLeaks("bbackupctl.memleaks");
+}
+
+inline void sync_and_wait()
+{
+        TEST_THAT(::system(BBACKUPCTL " -q -c testfiles/bbackupd.conf "
+                "force-sync") == 0);
+        TestRemoteProcessMemLeaks("bbackupctl.memleaks");
+}
 
 inline void terminate_bbackupd(int pid)

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -543 +543 @@
         }
 }
-#endif // !WIN32
-
-void force_sync()
-{
-        TEST_THAT(::system(BBACKUPCTL " -q -c testfiles/bbackupd.conf "
-                "force-sync") == 0);
-        TestRemoteProcessMemLeaks("bbackupctl.memleaks");
-}
-
-void wait_for_sync_start()
-{
-        TEST_THAT(::system(BBACKUPCTL " -q -c testfiles/bbackupd.conf "
-                "wait-for-sync") == 0);
-        TestRemoteProcessMemLeaks("bbackupctl.memleaks");
-}
-
-void wait_for_sync_end()
-{
-        TEST_THAT(::system(BBACKUPCTL " -q -c testfiles/bbackupd.conf "
-                "wait-for-end") == 0);
-        TestRemoteProcessMemLeaks("bbackupctl.memleaks");
-}
-
-void sync_and_wait()
-{
-        TEST_THAT(::system(BBACKUPCTL " -q -c testfiles/bbackupd.conf "
-                "force-sync") == 0);
-        TestRemoteProcessMemLeaks("bbackupctl.memleaks");
-}
-
-#ifdef WIN32
+
 bool set_file_time(const char* filename, FILETIME creationTime, 
         FILETIME lastModTime, FILETIME lastAccessTime)