1 files changed, 11 insertions, 6 deletions
diff --git a/messagebus_test/src/tests/speed/speed.cpp b/messagebus_test/src/tests/speed/speed.cpp
index 31ea419ce5c..3a5f56c6144 100644
--- a/messagebus_test/src/tests/speed/speed.cpp
+++ b/messagebus_test/src/tests/speed/speed.cpp
@@ -3,6 +3,7 @@
 #include <vespa/log/log.h>
 LOG_SETUP("speed_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,10 @@ Test::Main()
 {
     TEST_INIT("speed_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_EQUAL(system("echo slobrok[1] > slobrok.cfg"), 0);
         EXPECT_EQUAL(system(make_string("echo 'slobrok[0].connectionspec tcp/localhost:%d' "
@@ -23,29 +28,29 @@ Test::Main()
     }
     { // CPP SERVER
         { // Make routing config
-            EXPECT_EQUAL(system("cat routing-template.cfg | sed 's#session#cpp/session#' > routing.cfg"), 0);
+            EXPECT_EQUAL(system(("cat " + routing_template + " | sed 's#session#cpp/session#' > routing.cfg").c_str()), 0);
         }
         fprintf(stderr, "STARTING CPP-SERVER\n");
-        EXPECT_EQUAL(system("sh ctl.sh start server cpp"), 0);
+        EXPECT_EQUAL(system((ctl_script + " start server cpp").c_str()), 0);
         fprintf(stderr, "STARTING CPP-CLIENT\n");
         EXPECT_EQUAL(system("./messagebus_test_cpp-client-speed_app"), 0);
         fprintf(stderr, "STARTING JAVA-CLIENT\n");
         EXPECT_EQUAL(system("../../binref/runjava JavaClient"), 0);
         fprintf(stderr, "STOPPING\n");
-        EXPECT_EQUAL(system("sh ctl.sh stop server cpp"), 0);
+        EXPECT_EQUAL(system((ctl_script + " stop server cpp"), 0);
     }
     { // JAVA SERVER
         { // Make routing config
-            EXPECT_EQUAL(system("cat routing-template.cfg | sed 's#session#java/session#' > routing.cfg"), 0);
+            EXPECT_EQUAL(system(("cat " + routing_template + " | sed 's#session#java/session#' > routing.cfg").c_str()), 0);
         }
         fprintf(stderr, "STARTING JAVA-SERVER\n");
-        EXPECT_EQUAL(system("sh ctl.sh start server java"), 0);
+        EXPECT_EQUAL(system((ctl_script + " start server java").c_str()), 0);
         fprintf(stderr, "STARTING CPP-CLIENT\n");
         EXPECT_EQUAL(system("./messagebus_test_cpp-client-speed_app"), 0);
         fprintf(stderr, "STARTING JAVA-CLIENT\n");
         EXPECT_EQUAL(system("../../binref/runjava JavaClient"), 0);
         fprintf(stderr, "STOPPING\n");
-        EXPECT_EQUAL(system("sh ctl.sh stop server java"), 0);
+        EXPECT_EQUAL(system((ctl_script + " stop server java").c_str()), 0);
     }
     TEST_DONE();
 }