summaryrefslogtreecommitdiff
path: root/test/bbackupd
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2007-11-07 21:04:22 +0000
committerChris Wilson <chris+github@qwirx.com>2007-11-07 21:04:22 +0000
commitc5847429a0d0f277502525e749aca221097045e1 (patch)
tree23fe4675bd811f996e057fbf07ad9953c37baa4d /test/bbackupd
parent3974cab358e855546227c676b4e36fb96664166e (diff)
Fix calling bbackupd with NO args in keepalive tests (fixes [1928])
Diffstat (limited to 'test/bbackupd')
-rw-r--r--test/bbackupd/testbbackupd.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp
index 5e94efc8..76a5d2f4 100644
--- a/test/bbackupd/testbbackupd.cpp
+++ b/test/bbackupd/testbbackupd.cpp
@@ -626,7 +626,16 @@ int start_internal_daemon()
};
BackupDaemon daemon;
- int result = daemon.Main("testfiles/bbackupd.conf", 2, argv);
+ int result;
+
+ if (bbackupd_args.size() > 0)
+ {
+ result = daemon.Main("testfiles/bbackupd.conf", 2, argv);
+ }
+ else
+ {
+ result = daemon.Main("testfiles/bbackupd.conf", 1, argv);
+ }
TEST_THAT(result == 0);
if (result != 0)