[Box Backup-commit] COMMIT r1686 - box/chris/general/test/bbackupd

boxbackup-dev@fluffy.co.uk boxbackup-dev@fluffy.co.uk
Sat, 26 May 2007 16:28:19 +0100


Author: chris
Date: 2007-05-26 16:28:19 +0100 (Sat, 26 May 2007)
New Revision: 1686

Modified:
   box/chris/general/test/bbackupd/testbbackupd.cpp
Log:
Pass the config file name directly to Daemon::Main, instead of faking argv.


Modified: box/chris/general/test/bbackupd/testbbackupd.cpp
===================================================================
--- box/chris/general/test/bbackupd/testbbackupd.cpp	2007-05-26 15:27:29 UTC (rev 1685)
+++ box/chris/general/test/bbackupd/testbbackupd.cpp	2007-05-26 15:28:19 UTC (rev 1686)
@@ -612,11 +612,8 @@
 	int own_pid = getpid();
 		
 	BackupDaemon daemon;
-	const char* fake_argv[] = { "bbackupd", "testfiles/bbackupd.conf" };
+	int result = daemon.Main("testfiles/bbackupd.conf");
 	
-	int result = daemon.Main(BOX_FILE_BBACKUPD_DEFAULT_CONFIG, 2, 
-		fake_argv);
-	
 	TEST_THAT(result == 0);
 	if (result != 0)
 	{