diff options
author | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-08-25 11:18:40 +0200 |
---|---|---|
committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-08-25 11:18:40 +0200 |
commit | 7ecbe9897c1365f5f882e1d6a80a77a9845c604f (patch) | |
tree | 70acdffe04955cd50879abdd5bc87deb2c112e4f | |
parent | 369a1f8b61b2411a85f36717774349f08ec1eef6 (diff) |
Added more dependencies to be able to compile and test in parallell.
-rw-r--r-- | fsa/src/alltest/CMakeLists.txt | 5 | ||||
-rw-r--r-- | searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt | 2 | ||||
-rw-r--r-- | slobrok/src/tests/startsome/CMakeLists.txt | 2 | ||||
-rw-r--r-- | vespalib/src/tests/testkit-subset/CMakeLists.txt | 3 | ||||
-rw-r--r-- | vespamalloc/src/tests/allocfree/CMakeLists.txt | 3 | ||||
-rw-r--r-- | vespamalloc/src/tests/doubledelete/CMakeLists.txt | 3 | ||||
-rw-r--r-- | vespamalloc/src/tests/overwrite/CMakeLists.txt | 3 | ||||
-rw-r--r-- | vespamalloc/src/tests/thread/CMakeLists.txt | 3 |
8 files changed, 16 insertions, 8 deletions
diff --git a/fsa/src/alltest/CMakeLists.txt b/fsa/src/alltest/CMakeLists.txt index f9cd36d1fe7..b6e77eb6bc1 100644 --- a/fsa/src/alltest/CMakeLists.txt +++ b/fsa/src/alltest/CMakeLists.txt @@ -67,4 +67,7 @@ vespa_add_executable(fsa_vectorizer_perf_test_app TEST DEPENDS fsa ) -vespa_add_test(NAME fsa_vectorizer_perf_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/alltest.sh) +vespa_add_test(NAME fsa_vectorizer_perf_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/alltest.sh + DEPENDS fsa_conceptnet_test_app fsa_detector_test_app fsa_fsa_test_app fsa_fsa_create_test_app + fsa_fsa_perf_test_app fsa_fsamanager_test_app fsa_lookup_test_app fsa_ngram_test_app + fsa_segmenter_test_app fsa_vectorizer_test_app fsa_vectorizer_perf_test_app) diff --git a/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt b/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt index b70ce32777a..9c846243cfa 100644 --- a/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt +++ b/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt @@ -5,4 +5,4 @@ vespa_add_executable(searchcore_verify_ranksetup_test_app TEST DEPENDS ) vespa_add_test(NAME searchcore_verify_ranksetup_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/verify_ranksetup_test.sh - DEPENDS searchcore_verify_ranksetup_test_app) + DEPENDS searchcore_verify_ranksetup_test_app searchcore_verify_ranksetup_app) diff --git a/slobrok/src/tests/startsome/CMakeLists.txt b/slobrok/src/tests/startsome/CMakeLists.txt index 51ae234dc7f..95d09f61279 100644 --- a/slobrok/src/tests/startsome/CMakeLists.txt +++ b/slobrok/src/tests/startsome/CMakeLists.txt @@ -10,4 +10,4 @@ vespa_add_executable(slobrok_rpc_info_app DEPENDS ) vespa_add_test(NAME slobrok_tstdst_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/startsome.sh - DEPENDS slobrok_tstdst_app slobrok_rpc_info_app) + DEPENDS slobrok_tstdst_app slobrok_rpc_info_app slobrok_sbcmd_app slobrok_app) diff --git a/vespalib/src/tests/testkit-subset/CMakeLists.txt b/vespalib/src/tests/testkit-subset/CMakeLists.txt index d6d278a6628..4f8d67e2f63 100644 --- a/vespalib/src/tests/testkit-subset/CMakeLists.txt +++ b/vespalib/src/tests/testkit-subset/CMakeLists.txt @@ -6,4 +6,5 @@ vespa_add_executable(vespalib_testkit-subset_test_app TEST DEPENDS vespalib ) -vespa_add_test(NAME vespalib_testkit-subset_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testkit-subset_test.sh) +vespa_add_test(NAME vespalib_testkit-subset_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testkit-subset_test.sh + DEPENDS vespalib_testkit-subset_test_app) diff --git a/vespamalloc/src/tests/allocfree/CMakeLists.txt b/vespamalloc/src/tests/allocfree/CMakeLists.txt index 5d17e7412fb..3b518189b15 100644 --- a/vespamalloc/src/tests/allocfree/CMakeLists.txt +++ b/vespamalloc/src/tests/allocfree/CMakeLists.txt @@ -23,4 +23,5 @@ vespa_add_executable(vespamalloc_linklist_test_app dl ) vespa_add_test(NAME vespamalloc_allocfree_shared_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/allocfree_test.sh BENCHMARK - DEPENDS vespamalloc_realloc_test_app vespamalloc_allocfree_shared_test_app vespamalloc_linklist_test_app) + DEPENDS vespamalloc_realloc_test_app vespamalloc_allocfree_shared_test_app vespamalloc_linklist_test_app + vespamalloc vespamalloc_vespamallocd) diff --git a/vespamalloc/src/tests/doubledelete/CMakeLists.txt b/vespamalloc/src/tests/doubledelete/CMakeLists.txt index 7ea7e9f6af0..0c05998e0dc 100644 --- a/vespamalloc/src/tests/doubledelete/CMakeLists.txt +++ b/vespamalloc/src/tests/doubledelete/CMakeLists.txt @@ -10,4 +10,5 @@ vespa_add_executable(vespamalloc_expectsignal_app 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) + DEPENDS vespamalloc_doubledelete_test_app vespamalloc_expectsignal_app + vespamalloc vespamalloc_vespamallocd) diff --git a/vespamalloc/src/tests/overwrite/CMakeLists.txt b/vespamalloc/src/tests/overwrite/CMakeLists.txt index 0cb7a68e88e..832881c0088 100644 --- a/vespamalloc/src/tests/overwrite/CMakeLists.txt +++ b/vespamalloc/src/tests/overwrite/CMakeLists.txt @@ -11,4 +11,5 @@ vespa_add_executable(vespamalloc_expectsignal-overwrite_app 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) + DEPENDS vespamalloc_overwrite_test_app vespamalloc_expectsignal-overwrite_app + vespamalloc vespamalloc_vespamallocd) diff --git a/vespamalloc/src/tests/thread/CMakeLists.txt b/vespamalloc/src/tests/thread/CMakeLists.txt index 0a00332b148..3fb006efc43 100644 --- a/vespamalloc/src/tests/thread/CMakeLists.txt +++ b/vespamalloc/src/tests/thread/CMakeLists.txt @@ -8,4 +8,5 @@ vespa_add_executable(vespamalloc_racemanythreads_test_app 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) + DEPENDS vespamalloc_thread_test_app vespamalloc_racemanythreads_test_app + vespamalloc vespamalloc_vespamallocd) |