[Box Backup-dev] COMMIT r684 - box/chris/general/test/backupstorefix

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-07-23 22:24:08 +0000 (Sun, 23 Jul 2006)
New Revision: 684

Modified:
   box/chris/general/test/backupstorefix/testbackupstorefix.cpp
Log:
* testbackupstorefix.cpp
- Use BBACKUPD define to remove a #ifdef


Modified: box/chris/general/test/backupstorefix/testbackupstorefix.cpp
===================================================================
--- box/chris/general/test/backupstorefix/testbackupstorefix.cpp	2006-07-23 22:22:47 UTC (rev 683)
+++ box/chris/general/test/backupstorefix/testbackupstorefix.cpp	2006-07-23 22:24:08 UTC (rev 684)
@@ -317,11 +317,8 @@
 		// Run the perl script to create the initial directories
 		TEST_THAT_ABORTONFAIL(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl init") == 0);
 
-#ifdef WIN32
-		int bbackupd_pid = LaunchServer("..\\..\\bin\\bbackupd\\bbackupd testfiles/bbackupd.conf", "testfiles/bbackupd.pid");
-#else
-		int bbackupd_pid = LaunchServer("../../bin/bbackupd/bbackupd testfiles/bbackupd.conf", "testfiles/bbackupd.pid");
-#endif
+		int bbackupd_pid = LaunchServer(BBACKUPD
+			" testfiles/bbackupd.conf", "testfiles/bbackupd.pid");
 
 		TEST_THAT(bbackupd_pid != -1 && bbackupd_pid != 0);
 		if(bbackupd_pid > 0)