[Box Backup-commit] COMMIT r3524 - box/trunk/test/basicserver

[subversion at boxbackup.org]

Author: chris
Date: 2015-02-15 13:06:02 +0000 (Sun, 15 Feb 2015)
New Revision: 3524

Modified:
   box/trunk/test/basicserver/testbasicserver.cpp
Log:
Fix test failures caused by renaming the test executable, thanks to Achim for reporting.


Modified: box/trunk/test/basicserver/testbasicserver.cpp
===================================================================
--- box/trunk/test/basicserver/testbasicserver.cpp	2015-02-01 21:24:26 UTC (rev 3523)
+++ box/trunk/test/basicserver/testbasicserver.cpp	2015-02-15 13:06:02 UTC (rev 3524)
@@ -486,7 +486,7 @@
 
 	// Launch a basic server
 	{
-		std::string cmd = "./test --test-daemon-args=";
+		std::string cmd = "./_test --test-daemon-args=";
 		cmd += test_args;
 		cmd += " srv1 testfiles/srv1.conf";
 		int pid = LaunchServer(cmd, "testfiles/srv1.pid");
@@ -532,7 +532,7 @@
 	
 	// Launch a test forking server
 	{
-		std::string cmd = "./test --test-daemon-args=";
+		std::string cmd = "./_test --test-daemon-args=";
 		cmd += test_args;
 		cmd += " srv2 testfiles/srv2.conf";
 		int pid = LaunchServer(cmd, "testfiles/srv2.pid");
@@ -602,7 +602,7 @@
 
 	// Launch a test SSL server
 	{
-		std::string cmd = "./test --test-daemon-args=";
+		std::string cmd = "./_test --test-daemon-args=";
 		cmd += test_args;
 		cmd += " srv3 testfiles/srv3.conf";
 		int pid = LaunchServer(cmd, "testfiles/srv3.pid");
@@ -683,7 +683,7 @@
 //protocolserver:
 	// Launch a test protocol handling server
 	{
-		std::string cmd = "./test --test-daemon-args=";
+		std::string cmd = "./_test --test-daemon-args=";
 		cmd += test_args;
 		cmd += " srv4 testfiles/srv4.conf";
 		int pid = LaunchServer(cmd, "testfiles/srv4.pid");