Fixed benchmarks to run out of source (except those not working in source).

7 files changed, 16 insertions, 6 deletions

diff --git a/logd/src/tests/rotate/CMakeLists.txt b/logd/src/tests/rotate/CMakeLists.txt
index 2923250441b..b289c607347 100644
--- a/logd/src/tests/rotate/CMakeLists.txt
+++ b/logd/src/tests/rotate/CMakeLists.txt
@@ -9,4 +9,5 @@ vespa_add_executable(logd_dummylogger_app
     dummylogger.cpp
     DEPENDS
 )
-vespa_add_test(NAME logd_rotate_test NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rotate_test.sh BENCHMARK)
+vespa_add_test(NAME logd_rotate_test NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rotate_test.sh BENCHMARK
+               DEPENDS logd_dummyserver_app logd_dummylogger_app)
diff --git a/searchlib/src/tests/transactionlogstress/CMakeLists.txt b/searchlib/src/tests/transactionlogstress/CMakeLists.txt
index c91b0e34b40..f089bf70c69 100644
--- a/searchlib/src/tests/transactionlogstress/CMakeLists.txt
+++ b/searchlib/src/tests/transactionlogstress/CMakeLists.txt
@@ -5,4 +5,4 @@ vespa_add_executable(searchlib_translogstress_app
     DEPENDS
     searchlib
 )
-vespa_add_test(NAME searchlib_translogstress_app COMMAND searchlib_translogstress_app BENCHMARK)
+vespa_add_test(NAME searchlib_translogstress_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/translogstress_test.sh BENCHMARK)
diff --git a/searchlib/src/tests/transactionlogstress/translogstress_test.sh b/searchlib/src/tests/transactionlogstress/translogstress_test.sh
new file mode 100755
index 00000000000..2ca4525707f
--- /dev/null
+++ b/searchlib/src/tests/transactionlogstress/translogstress_test.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+rm -rf server
+$VALGRIND ./searchlib_translogstress_app
+
diff --git a/staging_vespalib/src/tests/benchmark/CMakeLists.txt b/staging_vespalib/src/tests/benchmark/CMakeLists.txt
index be8ea976c1d..fc80622c8be 100644
--- a/staging_vespalib/src/tests/benchmark/CMakeLists.txt
+++ b/staging_vespalib/src/tests/benchmark/CMakeLists.txt
@@ -6,4 +6,5 @@ vespa_add_executable(staging_vespalib_benchmark_test_app
     DEPENDS
     staging_vespalib
 )
-vespa_add_test(NAME staging_vespalib_benchmark_test NO_VALGRIND COMMAND sh benchmark_test.sh BENCHMARK)
+vespa_add_test(NAME staging_vespalib_benchmark_test NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/benchmark_test.sh BENCHMARK  
+               DEPENDS staging_vespalib_benchmark_test_app)
diff --git a/staging_vespalib/src/tests/benchmark/benchmark_test.sh b/staging_vespalib/src/tests/benchmark/benchmark_test.sh
index f43454fe2a6..f9e474e01ed 100755
--- a/staging_vespalib/src/tests/benchmark/benchmark_test.sh
+++ b/staging_vespalib/src/tests/benchmark/benchmark_test.sh
@@ -12,7 +12,7 @@ $TIME ./staging_vespalib_benchmark_test_app vespalib::ReturnByValueMultiVectorSt
 $TIME ./staging_vespalib_benchmark_test_app vespalib::ClockSystem 1000 1
 $TIME ./staging_vespalib_benchmark_test_app vespalib::ClockGToD 1000 1
 $TIME ./staging_vespalib_benchmark_test_app vespalib::ClockGToD 20000 1
-$TIME./staging_vespalib_benchmark_test_app vespalib::ClockREALTIME 1000 1
+$TIME ./staging_vespalib_benchmark_test_app vespalib::ClockREALTIME 1000 1
 $TIME ./staging_vespalib_benchmark_test_app vespalib::ClockMONOTONIC 1000 1
 $TIME ./staging_vespalib_benchmark_test_app vespalib::ClockMONOTONIC_RAW 1000 1
 $TIME ./staging_vespalib_benchmark_test_app vespalib::ClockPROCESS_CPUTIME_ID 2500 1
diff --git a/vespalib/src/tests/slime/json_slime_benchmark.cpp b/vespalib/src/tests/slime/json_slime_benchmark.cpp
index c3fc9aae8fa..73c5dbceab6 100644
--- a/vespalib/src/tests/slime/json_slime_benchmark.cpp
+++ b/vespalib/src/tests/slime/json_slime_benchmark.cpp
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastos/fastos.h>
 #include <vespa/vespalib/data/slime/slime.h>
+#include <vespa/vespalib/testkit/testapp.h>
 #include <iostream>
 #include <fstream>
 #include <sstream>
@@ -36,7 +37,7 @@ int main(int argc, char *argv[])
     if (argc > 1) {
         numRep = strtoul(argv[1], 0, 0);
     }
-    std::ifstream file("large_json.txt");
+    std::ifstream file((vespalib::TestApp::GetSourceDirectory() + "large_json.txt").c_str());
     assert(file.is_open());
     std::stringstream buf;
     buf << file.rdbuf();
diff --git a/vespamalloc/src/tests/allocfree/CMakeLists.txt b/vespamalloc/src/tests/allocfree/CMakeLists.txt
index 08588fa6aa6..494e2ac3640 100644
--- a/vespamalloc/src/tests/allocfree/CMakeLists.txt
+++ b/vespamalloc/src/tests/allocfree/CMakeLists.txt
@@ -8,7 +8,8 @@ vespa_add_executable(vespamalloc_allocfree_shared_test_app
     allocfree.cpp
     producerconsumer.cpp
 )
-vespa_add_test(NAME vespamalloc_allocfree_shared_test_app NO_VALGRIND COMMAND sh allocfree_test.sh BENCHMARK)
+vespa_add_test(NAME vespamalloc_allocfree_shared_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/allocfree_test.sh BENCHMARK
+               DEPENDS vespamalloc_allocfree_shared_test_app)
 vespa_add_executable(vespamalloc_realloc_test_app
     SOURCES
     realloc.cpp