16 files changed, 54 insertions, 33 deletions
diff --git a/messagebus/src/vespa/messagebus/testlib/CMakeLists.txt b/messagebus/src/vespa/messagebus/testlib/CMakeLists.txt
index 4c930bfd9aa..2c80b4d155c 100644
--- a/messagebus/src/vespa/messagebus/testlib/CMakeLists.txt
+++ b/messagebus/src/vespa/messagebus/testlib/CMakeLists.txt
@@ -13,5 +13,6 @@ vespa_add_library(messagebus_messagebus-test
     testserver.cpp
     INSTALL lib64
     DEPENDS
+    messagebus
     slobrok_slobrokserver
 )
diff --git a/messagebus_test/src/binref/env.sh.in b/messagebus_test/src/binref/env.sh.in
index 64bbed9c51e..d485eb9dfea 100644
--- a/messagebus_test/src/binref/env.sh.in
+++ b/messagebus_test/src/binref/env.sh.in
@@ -1,4 +1,2 @@
 BINREF=@CMAKE_CURRENT_BINARY_DIR@
-SBCMD=@PROJECT_BINARY_DIR@/slobrok/src/apps/sbcmd/sbcmd
-SLOBROK=@PROJECT_BINARY_DIR@/slobrok/src/apps/slobrok/slobrok
-export BINREF SBCMD SLOBROK 
+export BINREF 
diff --git a/messagebus_test/src/binref/progctl.sh b/messagebus_test/src/binref/progctl.sh
index 781d2058cf9..2c1fb1d47ce 120000
--- a/messagebus_test/src/binref/progctl.sh
+++ b/messagebus_test/src/binref/progctl.sh
@@ -1 +1 @@
-../../../../vespalib/src/vespa/vespalib/testkit/progctl.sh
-\ No newline at end of file
+../../../vespalib/src/vespa/vespalib/testkit/progctl.sh
+\ No newline at end of file
diff --git a/messagebus_test/src/binref/testrun.sh b/messagebus_test/src/binref/testrun.sh
index 457b9f75c5e..56c3c1186d8 120000
--- a/messagebus_test/src/binref/testrun.sh
+++ b/messagebus_test/src/binref/testrun.sh
@@ -1 +1 @@
-../../../../vespalib/src/vespa/vespalib/testkit/testrun.sh
-\ No newline at end of file
+../../../vespalib/src/vespa/vespalib/testkit/testrun.sh
+\ No newline at end of file
diff --git a/messagebus_test/src/tests/compile-java/compile-java_test.sh b/messagebus_test/src/tests/compile-java/compile-java_test.sh
index 9b94ffd51a1..d99e3e841e5 100755
--- a/messagebus_test/src/tests/compile-java/compile-java_test.sh
+++ b/messagebus_test/src/tests/compile-java/compile-java_test.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 set -e
+
+if [ -z "$SOURCE_DIRECTORY" ]; then
+    SOURCE_DIRECTORY="."
+fi
+
 . ../../binref/env.sh
 
-$BINREF/compilejava TestCompile.java
+$BINREF/compilejava $SOURCE_DIRECTORY/TestCompile.java
 $BINREF/runjava TestCompile
 
diff --git a/messagebus_test/src/tests/error/CMakeLists.txt b/messagebus_test/src/tests/error/CMakeLists.txt
index db826155755..926047f31cd 100644
--- a/messagebus_test/src/tests/error/CMakeLists.txt
+++ b/messagebus_test/src/tests/error/CMakeLists.txt
@@ -3,19 +3,19 @@ vespa_add_executable(messagebus_test_error_test_app TEST
     SOURCES
     error.cpp
     DEPENDS
-    messagebus
+    messagebus_messagebus-test
 )
 vespa_add_executable(messagebus_test_cpp-server-error_app
     SOURCES
     cpp-server.cpp
     DEPENDS
-    messagebus
+    messagebus_messagebus-test
 )
 vespa_add_executable(messagebus_test_cpp-client-error_app
     SOURCES
     cpp-client.cpp
     DEPENDS
-    messagebus
+    messagebus_messagebus-test
 )
 vespa_add_test(NAME messagebus_test_error_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/error_test.sh
                DEPENDS messagebus_test_error_test_app messagebus_test_cpp-server-error_app messagebus_test_cpp-client-error_app)
diff --git a/messagebus_test/src/tests/error/error.cpp b/messagebus_test/src/tests/error/error.cpp
index 63991b34a95..749874a5ef2 100644
--- a/messagebus_test/src/tests/error/error.cpp
+++ b/messagebus_test/src/tests/error/error.cpp
@@ -37,7 +37,7 @@ Test::Main()
     }
     { // JAVA SERVER
         { // Make routing config
-            EXPECT_TRUE(system("cat " + routing_tesmplate + " | sed 's#session#java/session#' > routing.cfg").c_str()) == 0);
+            EXPECT_TRUE(system(("cat " + routing_template + " | sed 's#session#java/session#' > routing.cfg").c_str()) == 0);
         }
         fprintf(stderr, "STARTING JAVA-SERVER\n");
         EXPECT_TRUE(system((ctl_script + " start server java").c_str()) == 0);
diff --git a/messagebus_test/src/tests/error/error_test.sh b/messagebus_test/src/tests/error/error_test.sh
index e2b567f5823..0c39f3d1ad3 100755
--- a/messagebus_test/src/tests/error/error_test.sh
+++ b/messagebus_test/src/tests/error/error_test.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 set -e
+
+if [ -z "$SOURCE_DIRECTORY" ]; then
+    SOURCE_DIRECTORY="."
+fi
+
 . ../../binref/env.sh
 
-$BINREF/compilejava JavaServer.java
-$BINREF/compilejava JavaClient.java
+$BINREF/compilejava $SOURCE_DIRECTORY/JavaServer.java
+$BINREF/compilejava $SOURCE_DIRECTORY/JavaClient.java
 VESPA_LOG_LEVEL='all -spam' ./messagebus_test_error_test_app
diff --git a/messagebus_test/src/tests/errorcodes/CMakeLists.txt b/messagebus_test/src/tests/errorcodes/CMakeLists.txt
index dc099903c57..b996c58464c 100644
--- a/messagebus_test/src/tests/errorcodes/CMakeLists.txt
+++ b/messagebus_test/src/tests/errorcodes/CMakeLists.txt
@@ -5,5 +5,5 @@ vespa_add_executable(messagebus_test_dumpcodes_app TEST
     DEPENDS
     messagebus
 )
-vespa_add_test(NAME messagebus_test_dumpcodes_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIRECTORY}/errorcodes_test.sh
+vespa_add_test(NAME messagebus_test_dumpcodes_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/errorcodes_test.sh
    DEPENDS messagebus_test_dumpcodes_app)
diff --git a/messagebus_test/src/tests/errorcodes/errorcodes_test.sh b/messagebus_test/src/tests/errorcodes/errorcodes_test.sh
index a296f21ef4a..e6ecc033ef3 100755
--- a/messagebus_test/src/tests/errorcodes/errorcodes_test.sh
+++ b/messagebus_test/src/tests/errorcodes/errorcodes_test.sh
@@ -7,7 +7,7 @@ fi
 
 . ../../binref/env.sh
 
-$BINREF/compilejava DumpCodes.java
+$BINREF/compilejava $SOURCE_DIRECTORY/DumpCodes.java
 
 ./messagebus_test_dumpcodes_app > cpp-dump.txt
 $BINREF/runjava DumpCodes > java-dump.txt
diff --git a/messagebus_test/src/tests/speed/CMakeLists.txt b/messagebus_test/src/tests/speed/CMakeLists.txt
index 84092021584..5a5f9615c42 100644
--- a/messagebus_test/src/tests/speed/CMakeLists.txt
+++ b/messagebus_test/src/tests/speed/CMakeLists.txt
@@ -3,19 +3,19 @@ vespa_add_executable(messagebus_test_speed_test_app
     SOURCES
     speed.cpp
     DEPENDS
-    messagebus
+    messagebus_messagebus-test
 )
 vespa_add_executable(messagebus_test_cpp-server-speed_app
     SOURCES
     cpp-server.cpp
     DEPENDS
-    messagebus
+    messagebus_messagebus-test
 )
 vespa_add_executable(messagebus_test_cpp-client-speed_app
     SOURCES
     cpp-client.cpp
     DEPENDS
-    messagebus
+    messagebus_messagebus-test
 )
 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/speed.cpp b/messagebus_test/src/tests/speed/speed.cpp
index 3a5f56c6144..1cfe1ff5704 100644
--- a/messagebus_test/src/tests/speed/speed.cpp
+++ b/messagebus_test/src/tests/speed/speed.cpp
@@ -37,7 +37,7 @@ Test::Main()
         fprintf(stderr, "STARTING JAVA-CLIENT\n");
         EXPECT_EQUAL(system("../../binref/runjava JavaClient"), 0);
         fprintf(stderr, "STOPPING\n");
-        EXPECT_EQUAL(system((ctl_script + " stop server cpp"), 0);
+        EXPECT_EQUAL(system((ctl_script + " stop server cpp").c_str()), 0);
     }
     { // JAVA SERVER
         { // Make routing config
diff --git a/messagebus_test/src/tests/speed/speed_test.sh b/messagebus_test/src/tests/speed/speed_test.sh
index 4aefc712fb9..1d9ba27f84e 100755
--- a/messagebus_test/src/tests/speed/speed_test.sh
+++ b/messagebus_test/src/tests/speed/speed_test.sh
@@ -1,9 +1,13 @@
 #!/bin/bash
 set -e
 
+if [ -z "$SOURCE_DIRECTORY" ]; then
+    SOURCE_DIRECTORY="."
+fi
+
 . ../../binref/env.sh
 
-$BINREF/compilejava JavaServer.java
-$BINREF/compilejava JavaClient.java
+$BINREF/compilejava $SOURCE_DIRECTORY/JavaServer.java
+$BINREF/compilejava $SOURCE_DIRECTORY/JavaClient.java
 
 (ulimit -c; ulimit -H -c; ulimit -c unlimited; $VALGRIND ./messagebus_test_speed_test_app)
diff --git a/messagebus_test/src/tests/trace/CMakeLists.txt b/messagebus_test/src/tests/trace/CMakeLists.txt
index f14fbd705f4..f43d66d9122 100644
--- a/messagebus_test/src/tests/trace/CMakeLists.txt
+++ b/messagebus_test/src/tests/trace/CMakeLists.txt
@@ -3,13 +3,13 @@ vespa_add_executable(messagebus_test_trace_test_app TEST
     SOURCES
     trace.cpp
     DEPENDS
-    messagebus
+    messagebus_messagebus-test
 )
 vespa_add_executable(messagebus_test_cpp-server-trace_app
     SOURCES
     cpp-server.cpp
     DEPENDS
-    messagebus
+    messagebus_messagebus-test
 )
 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/trace_test.sh b/messagebus_test/src/tests/trace/trace_test.sh
index 8f4a725840d..7bd344a8618 100755
--- a/messagebus_test/src/tests/trace/trace_test.sh
+++ b/messagebus_test/src/tests/trace/trace_test.sh
@@ -1,8 +1,12 @@
 #!/bin/bash
 set -e
 
+if [ -z "$SOURCE_DIRECTORY" ]; then
+    SOURCE_DIRECTORY="."
+fi
+
 . ../../binref/env.sh
 
-$BINREF/compilejava JavaServer.java
+$BINREF/compilejava $SOURCE_DIRECTORY/JavaServer.java
 
 $VALGRIND ./messagebus_test_trace_test_app
diff --git a/searchcorespi/src/tests/plugin/CMakeLists.txt b/searchcorespi/src/tests/plugin/CMakeLists.txt
index ef7f0ad316f..333f927c3d2 100644
--- a/searchcorespi/src/tests/plugin/CMakeLists.txt
+++ b/searchcorespi/src/tests/plugin/CMakeLists.txt
@@ -1,14 +1,28 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_library(searchcorespi_tplugin
+        SOURCES
+        plugin.cpp
+        DEPENDS
+)
+vespa_add_library(searchcorespi_illegal-plugin
+        SOURCES
+        empty.cpp
+        DEPENDS
+)
 vespa_add_executable(searchcorespi_plugin_test_app TEST
     SOURCES
     plugin_test.cpp
     DEPENDS
     searchcorespi
+    AFTER
+    searchcorespi_tplugin
+    searchcorespi_illegal-plugin
 )
 vespa_add_test(
     NAME searchcorespi_plugin_test_app
     COMMAND searchcorespi_plugin_test_app
     ENVIRONMENT "LD_LIBRARY_PATH=."
+    DEPENDS searchcorespi_tplugin searchcorespi_illegal-plugin
 )
 vespa_add_executable(searchcorespi_factoryregistry_test_app TEST
     SOURCES
@@ -17,13 +31,3 @@ vespa_add_executable(searchcorespi_factoryregistry_test_app TEST
     searchcorespi
 )
 vespa_add_test(NAME searchcorespi_factoryregistry_test_app COMMAND searchcorespi_factoryregistry_test_app)
-vespa_add_library(searchcorespi_tplugin
-    SOURCES
-    plugin.cpp
-    DEPENDS
-)
-vespa_add_library(searchcorespi_illegal-plugin
-    SOURCES
-    empty.cpp
-    DEPENDS
-)