[Box Backup-commit] COMMIT r1554 - box/chris/merge/test/bbackupd

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2007-04-22 15:35:32 +0100 (Sun, 22 Apr 2007)
New Revision: 1554

Modified:
   box/chris/merge/test/bbackupd/testbbackupd.cpp
Log:
Use additional arguments from command line options when starting bbackupd
and bbstored. (refs #3)


Modified: box/chris/merge/test/bbackupd/testbbackupd.cpp
===================================================================
--- box/chris/merge/test/bbackupd/testbbackupd.cpp	2007-04-22 14:32:28 UTC (rev 1553)
+++ box/chris/merge/test/bbackupd/testbbackupd.cpp	2007-04-22 14:35:32 UTC (rev 1554)
@@ -419,8 +419,8 @@
 
 int test_run_bbstored()
 {
-	bbstored_pid = LaunchServer(BBSTORED " testfiles/bbstored.conf", 
-		"testfiles/bbstored.pid");
+	std::string cmd = BBSTORED + bbstored_args + " testfiles/bbstored.conf";
+	bbstored_pid = LaunchServer(cmd, "testfiles/bbstored.pid");
 
 	TEST_THAT(bbstored_pid != -1 && bbstored_pid != 0);
 
@@ -1042,8 +1042,8 @@
 	}
 #endif // PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE
 
-	bbackupd_pid = LaunchServer(BBACKUPD " testfiles/bbackupd.conf", 
-		"testfiles/bbackupd.pid");
+	std::string cmd = BBACKUPD + bbackupd_args + " testfiles/bbackupd.conf";
+	bbackupd_pid = LaunchServer(cmd, "testfiles/bbackupd.pid");
 
 	TEST_THAT(bbackupd_pid != -1 && bbackupd_pid != 0);
 
@@ -2100,9 +2100,8 @@
 		terminate_bbackupd(bbackupd_pid);
 		
 		// Start it again
-		bbackupd_pid = LaunchServer(BBACKUPD 
-			" testfiles/bbackupd.conf", 
-			"testfiles/bbackupd.pid");
+		cmd = BBACKUPD + bbackupd_args + " testfiles/bbackupd.conf";
+		bbackupd_pid = LaunchServer(cmd, "testfiles/bbackupd.pid");
 
 		TEST_THAT(bbackupd_pid != -1 && bbackupd_pid != 0);