diff options
| author | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-08-24 09:39:51 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-08-24 09:39:51 +0200 |
| commit | 126de36b96db7713839ed38a36d7023e4b8c522a (patch) | |
| tree | 49f16bcf3cf9fa3c4a8aab749b0e9895c7b3076d /staging_vespalib | |
| parent | ee484e4b7c324485dcff2f65d8329fbd16aba009 (diff) | |
Name dependencies for script tests.
Diffstat (limited to 'staging_vespalib')
3 files changed, 5 insertions, 3 deletions
diff --git a/staging_vespalib/src/tests/benchmark/CMakeLists.txt b/staging_vespalib/src/tests/benchmark/CMakeLists.txt index be8ea976c1d..088cec756cf 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/staging_vespalib/src/tests/util/process_memory_stats/CMakeLists.txt b/staging_vespalib/src/tests/util/process_memory_stats/CMakeLists.txt index aa1e2e0e2b6..209537232e4 100644 --- a/staging_vespalib/src/tests/util/process_memory_stats/CMakeLists.txt +++ b/staging_vespalib/src/tests/util/process_memory_stats/CMakeLists.txt @@ -5,4 +5,5 @@ vespa_add_executable(staging_vespalib_process_memory_stats_test_app TEST DEPENDS staging_vespalib ) -vespa_add_test(NAME staging_vespalib_process_memory_stats_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/process_memory_stats_test.sh) +vespa_add_test(NAME staging_vespalib_process_memory_stats_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/process_memory_stats_test.sh + DEPENDS staging_vespalib_process_memory_stats_test_app) |