Changeset 2010 for box/trunk/test

Timestamp:

16/12/2007 23:52:05 (4 years ago)

Author:

chris

Message:

Pass test options to test daemons.

File:

• box/trunk/test/basicserver/testbasicserver.cpp (modified) (4 diffs)

box/trunk/test/basicserver/testbasicserver.cpp

@@ -437 +437 @@
         // Launch a basic server
         {
-                int pid = LaunchServer("./test srv1 testfiles/srv1.conf", 
-                        "testfiles/srv1.pid");
+                std::string cmd = "./test";
+                cmd += test_args;
+                cmd += " srv1 testfiles/srv1.conf";
+                int pid = LaunchServer(cmd, "testfiles/srv1.pid");
 
                 TEST_THAT(pid != -1 && pid != 0);
@@ -481 +483 @@
         // Launch a test forking server
         {
-                int pid = LaunchServer("./test srv2 testfiles/srv2.conf", 
-                        "testfiles/srv2.pid");
+                std::string cmd = "./test";
+                cmd += test_args;
+                cmd += " srv2 testfiles/srv2.conf";
+                int pid = LaunchServer(cmd, "testfiles/srv2.pid");
 
                 TEST_THAT(pid != -1 && pid != 0);
@@ -549 +553 @@
         // Launch a test SSL server
         {
-                int pid = LaunchServer("./test srv3 testfiles/srv3.conf",
-                        "testfiles/srv3.pid");
+                std::string cmd = "./test";
+                cmd += test_args;
+                cmd += " srv3 testfiles/srv3.conf";
+                int pid = LaunchServer(cmd, "testfiles/srv3.pid");
 
                 TEST_THAT(pid != -1 && pid != 0);
@@ -628 +634 @@
         // Launch a test protocol handling server
         {
-                int pid = LaunchServer("./test srv4 testfiles/srv4.conf", 
-                        "testfiles/srv4.pid");
+                std::string cmd = "./test";
+                cmd += test_args;
+                cmd += " srv4 testfiles/srv4.conf";
+                int pid = LaunchServer(cmd, "testfiles/srv4.pid");
 
                 TEST_THAT(pid != -1 && pid != 0);