From 82bf8c7c7de152d460a341b3fd2fc17b6b4e8dcd Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 7 Nov 2007 23:11:55 +0000 Subject: Handle bbackupd_args without leading space. --- test/backupstorefix/testbackupstorefix.cpp | 2 +- test/bbackupd/testbbackupd.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/backupstorefix/testbackupstorefix.cpp b/test/backupstorefix/testbackupstorefix.cpp index cbff7e1e..9e2c5a4e 100644 --- a/test/backupstorefix/testbackupstorefix.cpp +++ b/test/backupstorefix/testbackupstorefix.cpp @@ -310,7 +310,7 @@ int test(int argc, const char *argv[]) TEST_THAT_ABORTONFAIL(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl init") == 0); - std::string cmd = BBACKUPD + bbackupd_args + + std::string cmd = BBACKUPD + " " + bbackupd_args + " testfiles/bbackupd.conf"; int bbackupd_pid = LaunchServer(cmd, "testfiles/bbackupd.pid"); TEST_THAT(bbackupd_pid != -1 && bbackupd_pid != 0); diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp index 76a5d2f4..26b7284d 100644 --- a/test/bbackupd/testbbackupd.cpp +++ b/test/bbackupd/testbbackupd.cpp @@ -1118,7 +1118,7 @@ int test_bbackupd() } #endif // PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE - std::string cmd = BBACKUPD + bbackupd_args + + std::string cmd = BBACKUPD + " " + bbackupd_args + " testfiles/bbackupd-temploc.conf"; bbackupd_pid = LaunchServer(cmd, "testfiles/bbackupd.pid"); @@ -1238,7 +1238,8 @@ int test_bbackupd() // Kill the daemon terminate_bbackupd(bbackupd_pid); - cmd = BBACKUPD + bbackupd_args + " testfiles/bbackupd.conf"; + cmd = BBACKUPD + " " + bbackupd_args + + " testfiles/bbackupd.conf"; bbackupd_pid = LaunchServer(cmd, "testfiles/bbackupd.pid"); TEST_THAT(bbackupd_pid != -1 && bbackupd_pid != 0); @@ -2976,7 +2977,8 @@ int test_bbackupd() terminate_bbackupd(bbackupd_pid); // Start it again - cmd = BBACKUPD + bbackupd_args + " testfiles/bbackupd.conf"; + cmd = BBACKUPD + " " + bbackupd_args + + " testfiles/bbackupd.conf"; bbackupd_pid = LaunchServer(cmd, "testfiles/bbackupd.pid"); TEST_THAT(bbackupd_pid != -1 && bbackupd_pid != 0); -- cgit v1.2.3