[Box Backup-commit] COMMIT r1499 - box/chris/merge/test/backupstorepatch

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2007-03-25 00:42:41 +0000 (Sun, 25 Mar 2007)
New Revision: 1499

Modified:
   box/chris/merge/test/backupstorepatch/testbackupstorepatch.cpp
Log:
Use #defined paths for executables to remove win32/unix differences.
(refs #3)


Modified: box/chris/merge/test/backupstorepatch/testbackupstorepatch.cpp
===================================================================
--- box/chris/merge/test/backupstorepatch/testbackupstorepatch.cpp	2007-03-25 00:37:54 UTC (rev 1498)
+++ box/chris/merge/test/backupstorepatch/testbackupstorepatch.cpp	2007-03-25 00:42:41 UTC (rev 1499)
@@ -310,9 +310,8 @@
 			"testfiles/clientTrustedCAs.pem");
 
 	// Create an account
-	TEST_THAT_ABORTONFAIL(RunCommand(
-		"../../bin/bbstoreaccounts/bbstoreaccounts "
-		"-c testfiles/bbstored.conf "
+	TEST_THAT_ABORTONFAIL(::system(BBSTOREACCOUNTS
+		" -c testfiles/bbstored.conf "
 		"create 01234567 0 30000B 40000B") == 0);
 	TestRemoteProcessMemLeaks("bbstoreaccounts.memleaks");
 
@@ -323,7 +322,8 @@
 	test_depends_in_dirs();
 
 	// First, try logging in without an account having been created... just make sure login fails.
-	int pid = LaunchServer("../../bin/bbstored/bbstored testfiles/bbstored.conf", "testfiles/bbstored.pid");
+	int pid = LaunchServer(BBSTORED " testfiles/bbstored.conf", 
+		"testfiles/bbstored.pid");
 	TEST_THAT(pid != -1 && pid != 0);
 	if(pid > 0)
 	{