More tests fixed.

5 files changed, 25 insertions, 10 deletions

diff --git a/messagebus_test/src/tests/speed/CMakeLists.txt b/messagebus_test/src/tests/speed/CMakeLists.txt
index 8e1018ec07c..84092021584 100644
--- a/messagebus_test/src/tests/speed/CMakeLists.txt
+++ b/messagebus_test/src/tests/speed/CMakeLists.txt
@@ -3,15 +3,19 @@ vespa_add_executable(messagebus_test_speed_test_app
     SOURCES
     speed.cpp
     DEPENDS
+    messagebus
 )
-vespa_add_test(NAME messagebus_test_speed_test_app COMMAND messagebus_test_speed_test_app BENCHMARK)
 vespa_add_executable(messagebus_test_cpp-server-speed_app
     SOURCES
     cpp-server.cpp
     DEPENDS
+    messagebus
 )
 vespa_add_executable(messagebus_test_cpp-client-speed_app
     SOURCES
     cpp-client.cpp
     DEPENDS
+    messagebus
 )
+vespa_add_test(NAME messagebus_test_speed_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/speed_test.sh BENCHMARK
+               DEPENDS messagebus_test_speed_test_app messagebus_test_cpp-server-speed_app messagebus_test_cpp-client-speed_app )
diff --git a/messagebus_test/src/tests/speed/ctl.sh b/messagebus_test/src/tests/speed/ctl.sh
index 864be4290ed..ca4fc7701e6 100755
--- a/messagebus_test/src/tests/speed/ctl.sh
+++ b/messagebus_test/src/tests/speed/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/speed/progdefs.sh b/messagebus_test/src/tests/speed/progdefs.sh
index 4e0390142cf..0b2bd600db0 100644
--- a/messagebus_test/src/tests/speed/progdefs.sh
+++ b/messagebus_test/src/tests/speed/progdefs.sh
@@ -1,3 +1,3 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 prog server cpp "" "./messagebus_test_cpp-server-speed_app"
-prog server java "" "../../binref/runjava JavaServer"
+prog server java "" "$BINREF/runjava JavaServer"
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();
 }
diff --git a/messagebus_test/src/tests/speed/speed_test.sh b/messagebus_test/src/tests/speed/speed_test.sh
index 77eb7e63e0c..4aefc712fb9 100644..100755
--- a/messagebus_test/src/tests/speed/speed_test.sh
+++ b/messagebus_test/src/tests/speed/speed_test.sh
@@ -6,4 +6,4 @@ set -e
 $BINREF/compilejava JavaServer.java
 $BINREF/compilejava JavaClient.java
 
-(ulimit -c; ulimit -H -c; ulimit -c unlimited; ./messagebus_test_speed_test_app)
+(ulimit -c; ulimit -H -c; ulimit -c unlimited; $VALGRIND ./messagebus_test_speed_test_app)