aboutsummaryrefslogtreecommitdiffstats
path: root/vespamalloc
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@yahoo-inc.com>2016-08-24 09:39:51 +0200
committerArnstein Ressem <aressem@yahoo-inc.com>2016-08-24 09:39:51 +0200
commit126de36b96db7713839ed38a36d7023e4b8c522a (patch)
tree49f16bcf3cf9fa3c4a8aab749b0e9895c7b3076d /vespamalloc
parentee484e4b7c324485dcff2f65d8329fbd16aba009 (diff)
Name dependencies for script tests.
Diffstat (limited to 'vespamalloc')
-rw-r--r--vespamalloc/src/tests/allocfree/CMakeLists.txt3
-rw-r--r--vespamalloc/src/tests/doubledelete/CMakeLists.txt3
-rw-r--r--vespamalloc/src/tests/overwrite/CMakeLists.txt3
-rw-r--r--vespamalloc/src/tests/thread/CMakeLists.txt3
4 files changed, 8 insertions, 4 deletions
diff --git a/vespamalloc/src/tests/allocfree/CMakeLists.txt b/vespamalloc/src/tests/allocfree/CMakeLists.txt
index 08588fa6aa6..f08fc45ca1a 100644
--- a/vespamalloc/src/tests/allocfree/CMakeLists.txt
+++ b/vespamalloc/src/tests/allocfree/CMakeLists.txt
@@ -8,7 +8,6 @@ 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_executable(vespamalloc_realloc_test_app
SOURCES
realloc.cpp
@@ -23,3 +22,5 @@ vespa_add_executable(vespamalloc_linklist_test_app
DEPENDS
dl
)
+vespa_add_test(NAME vespamalloc_allocfree_shared_test_app NO_VALGRIND COMMAND sh allocfree_test.sh BENCHMARK
+ DEPENDS vespamalloc_realloc_test_app vespamalloc_allocfree_shared_test_app vespamalloc_linklist_test_app)
diff --git a/vespamalloc/src/tests/doubledelete/CMakeLists.txt b/vespamalloc/src/tests/doubledelete/CMakeLists.txt
index 6d78198af24..7ea7e9f6af0 100644
--- a/vespamalloc/src/tests/doubledelete/CMakeLists.txt
+++ b/vespamalloc/src/tests/doubledelete/CMakeLists.txt
@@ -4,9 +4,10 @@ vespa_add_executable(vespamalloc_doubledelete_test_app TEST
doubledelete.cpp
DEPENDS
)
-vespa_add_test(NAME vespamalloc_doubledelete_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/doubledelete_test.sh)
vespa_add_executable(vespamalloc_expectsignal_app
SOURCES
expectsignal.cpp
DEPENDS
)
+vespa_add_test(NAME vespamalloc_doubledelete_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/doubledelete_test.sh
+ DEPENDS vespamalloc_doubledelete_test_app vespamalloc_expectsignal_app)
diff --git a/vespamalloc/src/tests/overwrite/CMakeLists.txt b/vespamalloc/src/tests/overwrite/CMakeLists.txt
index fe82fe0a01b..0cb7a68e88e 100644
--- a/vespamalloc/src/tests/overwrite/CMakeLists.txt
+++ b/vespamalloc/src/tests/overwrite/CMakeLists.txt
@@ -4,10 +4,11 @@ vespa_add_executable(vespamalloc_overwrite_test_app TEST
overwrite.cpp
DEPENDS
)
-vespa_add_test(NAME vespamalloc_overwrite_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/overwrite_test.sh)
file(COPY vespamalloc.conf DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
vespa_add_executable(vespamalloc_expectsignal-overwrite_app
SOURCES
expectsignal.cpp
DEPENDS
)
+vespa_add_test(NAME vespamalloc_overwrite_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/overwrite_test.sh
+ DEPENDS vespamalloc_overwrite_test_app vespamalloc_expectsignal-overwrite_app)
diff --git a/vespamalloc/src/tests/thread/CMakeLists.txt b/vespamalloc/src/tests/thread/CMakeLists.txt
index 61a60dfec04..0a00332b148 100644
--- a/vespamalloc/src/tests/thread/CMakeLists.txt
+++ b/vespamalloc/src/tests/thread/CMakeLists.txt
@@ -3,8 +3,9 @@ vespa_add_executable(vespamalloc_thread_test_app TEST
SOURCES
thread.cpp
)
-vespa_add_test(NAME vespamalloc_thread_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/thread_test.sh)
vespa_add_executable(vespamalloc_racemanythreads_test_app
SOURCES
racemanythreads.cpp
)
+vespa_add_test(NAME vespamalloc_thread_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/thread_test.sh
+ DEPENDS vespamalloc_thread_test_app vespamalloc_racemanythreads_test_app)