From 44b4c618d2506c861503bc1f6b4e0842339e051a Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris+github@qwirx.com>
Date: Sun, 4 Nov 2007 03:24:11 +0000
Subject: Move sync helper functions from test/bbackupd to Test.h to share with
 other tests, particularly test/backupstorefix.

---
 lib/common/Test.h              | 58 +++++++++++++++++++++++++++++++-----------
 test/bbackupd/testbbackupd.cpp | 30 ----------------------
 2 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/lib/common/Test.h b/lib/common/Test.h
index f6704db4..d377bce6 100644
--- a/lib/common/Test.h
+++ b/lib/common/Test.h
@@ -24,6 +24,22 @@
 
 #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;
 extern int first_fail_line;
 extern std::string first_fail_file;
@@ -353,21 +369,33 @@ inline void TestRemoteProcessMemLeaksFunc(const char *filename,
 #endif
 }
 
-#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)
 {
diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp
index ca3b5b54..5b7e2e6a 100644
--- a/test/bbackupd/testbbackupd.cpp
+++ b/test/bbackupd/testbbackupd.cpp
@@ -542,37 +542,7 @@ void do_interrupted_restore(const TLSContext &context, int64_t restoredirid)
 		}
 	}
 }
-#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)
 {
-- 
cgit v1.2.3