diff options
author | Chris Wilson <chris+github@qwirx.com> | 2015-12-12 22:49:41 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2015-12-13 23:48:22 +0000 |
commit | 768f2bd2c35d56f0df65c4c9acfe5649e776409e (patch) | |
tree | fc19952b3baf20acbcb36470912b9ec85f3555a7 /test | |
parent | a09d552396ea9d9d5decd3185601a4be7090415b (diff) |
Define TEST_EXECUTABLE to allow it to have different names on MSVC/CMake.
Diffstat (limited to 'test')
-rw-r--r-- | test/basicserver/testbasicserver.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/basicserver/testbasicserver.cpp b/test/basicserver/testbasicserver.cpp index 9e3b8890..6a1e15ad 100644 --- a/test/basicserver/testbasicserver.cpp +++ b/test/basicserver/testbasicserver.cpp @@ -485,7 +485,7 @@ int test(int argc, const char *argv[]) // Launch a basic server { - std::string cmd = "./_test --test-daemon-args="; + std::string cmd = TEST_EXECUTABLE " --test-daemon-args="; cmd += test_args; cmd += " srv1 testfiles/srv1.conf"; int pid = LaunchServer(cmd, "testfiles/srv1.pid"); @@ -531,7 +531,7 @@ int test(int argc, const char *argv[]) // Launch a test forking server { - std::string cmd = "./_test --test-daemon-args="; + std::string cmd = TEST_EXECUTABLE " --test-daemon-args="; cmd += test_args; cmd += " srv2 testfiles/srv2.conf"; int pid = LaunchServer(cmd, "testfiles/srv2.pid"); @@ -601,7 +601,7 @@ int test(int argc, const char *argv[]) // Launch a test SSL server { - std::string cmd = "./_test --test-daemon-args="; + std::string cmd = TEST_EXECUTABLE " --test-daemon-args="; cmd += test_args; cmd += " srv3 testfiles/srv3.conf"; int pid = LaunchServer(cmd, "testfiles/srv3.pid"); @@ -682,7 +682,7 @@ int test(int argc, const char *argv[]) //protocolserver: // Launch a test protocol handling server { - std::string cmd = "./_test --test-daemon-args="; + std::string cmd = TEST_EXECUTABLE " --test-daemon-args="; cmd += test_args; cmd += " srv4 testfiles/srv4.conf"; int pid = LaunchServer(cmd, "testfiles/srv4.pid"); |