diff options
Diffstat (limited to 'messagebus_test/src/tests/trace/trace.cpp')
| -rw-r--r-- | messagebus_test/src/tests/trace/trace.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/messagebus_test/src/tests/trace/trace.cpp b/messagebus_test/src/tests/trace/trace.cpp index 94550460c84..320110d10e2 100644 --- a/messagebus_test/src/tests/trace/trace.cpp +++ b/messagebus_test/src/tests/trace/trace.cpp @@ -3,6 +3,7 @@ #include <vespa/log/log.h> LOG_SETUP("trace_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> #include <vespa/messagebus/emptyreply.h> @@ -44,12 +45,14 @@ Test::Main() { TEST_INIT("trace_test"); Slobrok slobrok; + 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' " ">> slobrok.cfg", slobrok.port()).c_str()) == 0); } - EXPECT_TRUE(system("sh ctl.sh start all") == 0); + EXPECT_TRUE(system((ctl_script + " start all").c_str()) == 0); RPCMessageBus mb(ProtocolSet().add(IProtocol::SP(new SimpleProtocol())), RPCNetworkParams().setSlobrokConfig("file:slobrok.cfg"), "file:routing.cfg"); @@ -108,6 +111,6 @@ Test::Main() EXPECT_TRUE(!reply->hasErrors()); EXPECT_EQUAL(reply->getTrace().getRoot().encode(), expect.encode()); - EXPECT_TRUE(system("sh ctl.sh stop all") == 0); + EXPECT_TRUE(system((ctl_script + " stop all").c_str()) == 0); TEST_DONE(); } |