summaryrefslogtreecommitdiff
path: root/test/basicserver
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2015-12-12 22:49:41 +0000
committerChris Wilson <chris+github@qwirx.com>2015-12-12 22:49:41 +0000
commit232ef242e9a36a6d903fb8fc62a0791f94998b6d (patch)
tree3c9880a87675afa28868218d1b3c4d5902b953bd /test/basicserver
parent6c20c44e7c2b3982d42277f067e129df66b4b23a (diff)
Define TEST_EXECUTABLE to allow it to have different names on MSVC/CMake.
Diffstat (limited to 'test/basicserver')
-rw-r--r--test/basicserver/testbasicserver.cpp8
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");