diff options
author | Chris Wilson <chris+github@qwirx.com> | 2007-04-22 14:35:32 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2007-04-22 14:35:32 +0000 |
commit | 8a8e956d8f2baa99d8924f05b3124788c5bb1ebd (patch) | |
tree | a37479fd38a6b3fded7818338af762ed4c04693f /test/bbackupd | |
parent | b5da77c8bcc6e86bc4735308ac88ffde18a0a96f (diff) |
Use additional arguments from command line options when starting bbackupd
and bbstored. (refs #3)
Diffstat (limited to 'test/bbackupd')
-rw-r--r-- | test/bbackupd/testbbackupd.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp index 1593e070..320a0232 100644 --- a/test/bbackupd/testbbackupd.cpp +++ b/test/bbackupd/testbbackupd.cpp @@ -419,8 +419,8 @@ int test_setupaccount() 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 @@ int test_bbackupd() } #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 @@ int test_bbackupd() 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); |