5 files changed, 23 insertions, 12 deletions
diff --git a/messagebus_test/src/tests/trace/CMakeLists.txt b/messagebus_test/src/tests/trace/CMakeLists.txt
index af539fa2818..f14fbd705f4 100644
--- a/messagebus_test/src/tests/trace/CMakeLists.txt
+++ b/messagebus_test/src/tests/trace/CMakeLists.txt
@@ -3,11 +3,13 @@ vespa_add_executable(messagebus_test_trace_test_app TEST
     SOURCES
     trace.cpp
     DEPENDS
+    messagebus
 )
 vespa_add_executable(messagebus_test_cpp-server-trace_app
     SOURCES
     cpp-server.cpp
     DEPENDS
+    messagebus
 )
-vespa_add_test(NAME messagebus_test_trace_test_app NO_VALGRIND COMMAND sh trace_test.sh
+vespa_add_test(NAME messagebus_test_trace_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/trace_test.sh
                DEPENDS messagebus_test_trace_test_app messagebus_test_cpp-server-trace_app)
diff --git a/messagebus_test/src/tests/trace/ctl.sh b/messagebus_test/src/tests/trace/ctl.sh
index 864be4290ed..ca4fc7701e6 100755
--- a/messagebus_test/src/tests/trace/ctl.sh
+++ b/messagebus_test/src/tests/trace/ctl.sh
@@ -1,4 +1,10 @@
 #!/bin/bash
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-exec ../../binref/progctl.sh progdefs.sh "$@"
+if [ -z "$SOURCE_DIRECTORY" ]; then
+    SOURCE_DIRECTORY="."
+fi
+
+. ../../binref/env.sh
+
+exec $SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh "$@"
diff --git a/messagebus_test/src/tests/trace/progdefs.sh b/messagebus_test/src/tests/trace/progdefs.sh
index fd35b6503e2..4071da4beb5 100644
--- a/messagebus_test/src/tests/trace/progdefs.sh
+++ b/messagebus_test/src/tests/trace/progdefs.sh
@@ -6,10 +6,10 @@ prog server cpp4 "" "./messagebus_test_cpp-server-trace_app server/cpp/3/A"
 prog server cpp5 "" "./messagebus_test_cpp-server-trace_app server/cpp/3/B"
 prog server cpp6 "" "./messagebus_test_cpp-server-trace_app server/cpp/3/C"
 prog server cpp7 "" "./messagebus_test_cpp-server-trace_app server/cpp/3/D"
-prog server java1 "" "../../binref/runjava JavaServer server/java/1/A"
-prog server java2 "" "../../binref/runjava JavaServer server/java/2/A"
-prog server java3 "" "../../binref/runjava JavaServer server/java/2/B"
-prog server java4 "" "../../binref/runjava JavaServer server/java/3/A"
-prog server java5 "" "../../binref/runjava JavaServer server/java/3/B"
-prog server java6 "" "../../binref/runjava JavaServer server/java/3/C"
-prog server java7 "" "../../binref/runjava JavaServer server/java/3/D"
+prog server java1 "" "$BINREF/runjava JavaServer server/java/1/A"
+prog server java2 "" "$BINREF/runjava JavaServer server/java/2/A"
+prog server java3 "" "$BINREF/runjava JavaServer server/java/2/B"
+prog server java4 "" "$BINREF/runjava JavaServer server/java/3/A"
+prog server java5 "" "$BINREF/runjava JavaServer server/java/3/B"
+prog server java6 "" "$BINREF/runjava JavaServer server/java/3/C"
+prog server java7 "" "$BINREF/runjava JavaServer server/java/3/D"
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();
 }
diff --git a/messagebus_test/src/tests/trace/trace_test.sh b/messagebus_test/src/tests/trace/trace_test.sh
index 63005385332..8f4a725840d 100644..100755
--- a/messagebus_test/src/tests/trace/trace_test.sh
+++ b/messagebus_test/src/tests/trace/trace_test.sh
@@ -5,4 +5,4 @@ set -e
 
 $BINREF/compilejava JavaServer.java
 
-./messagebus_test_trace_test_app
+$VALGRIND ./messagebus_test_trace_test_app