diff options
Diffstat (limited to 'messagebus_test/src/tests/error/error.cpp')
-rw-r--r-- | messagebus_test/src/tests/error/error.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/messagebus_test/src/tests/error/error.cpp b/messagebus_test/src/tests/error/error.cpp index 9b01e5d61d0..63991b34a95 100644 --- a/messagebus_test/src/tests/error/error.cpp +++ b/messagebus_test/src/tests/error/error.cpp @@ -3,6 +3,7 @@ #include <vespa/log/log.h> LOG_SETUP("error_test"); #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/messagebus/testlib/slobrok.h> #include <vespa/vespalib/util/stringfmt.h> @@ -16,6 +17,9 @@ Test::Main() { TEST_INIT("error_test"); Slobrok slobrok; + const std::string routing_template = TEST_PATH("routing-template.cfg"); + const std::string ctl_script = TEST_PATH("ctl.sh"); + { // Make slobrok config EXPECT_TRUE(system("echo slobrok[1] > slobrok.cfg") == 0); EXPECT_TRUE(system(make_string("echo 'slobrok[0].connectionspec tcp/localhost:%d' " @@ -23,23 +27,23 @@ Test::Main() } { // CPP SERVER { // Make routing config - EXPECT_TRUE(system("cat routing-template.cfg | sed 's#session#cpp/session#' > routing.cfg") == 0); + EXPECT_TRUE(system(("cat " + routing_template + " | sed 's#session#cpp/session#' > routing.cfg").c_str()) == 0); } fprintf(stderr, "STARTING CPP-SERVER\n"); - EXPECT_TRUE(system("sh ctl.sh start server cpp") == 0); + EXPECT_TRUE(system((ctl_script + " start server cpp").c_str()) == 0); EXPECT_TRUE(system("./messagebus_test_cpp-client-error_app") == 0); EXPECT_TRUE(system("../../binref/runjava JavaClient") == 0); - EXPECT_TRUE(system("sh ctl.sh stop server cpp") == 0); + EXPECT_TRUE(system((ctl_script + " stop server cpp").c_str()) == 0); } { // JAVA SERVER { // Make routing config - EXPECT_TRUE(system("cat routing-template.cfg | sed 's#session#java/session#' > routing.cfg") == 0); + EXPECT_TRUE(system("cat " + routing_tesmplate + " | sed 's#session#java/session#' > routing.cfg").c_str()) == 0); } fprintf(stderr, "STARTING JAVA-SERVER\n"); - EXPECT_TRUE(system("sh ctl.sh start server java") == 0); + EXPECT_TRUE(system((ctl_script + " start server java").c_str()) == 0); EXPECT_TRUE(system("./messagebus_test_cpp-client-error_app") == 0); EXPECT_TRUE(system("../../binref/runjava JavaClient") == 0); - EXPECT_TRUE(system("sh ctl.sh stop server java") == 0); + EXPECT_TRUE(system((ctl_script + " stop server java").c_str()) == 0); } TEST_DONE(); } |