diff options
40 files changed, 83 insertions, 42 deletions
diff --git a/jrt_test/src/tests/echo/CMakeLists.txt b/jrt_test/src/tests/echo/CMakeLists.txt index 8de1ea6f842..bb4786ed582 100644 --- a/jrt_test/src/tests/echo/CMakeLists.txt +++ b/jrt_test/src/tests/echo/CMakeLists.txt @@ -4,4 +4,5 @@ vespa_add_executable(jrt_test_echo-client_app TEST echo-client.cpp DEPENDS ) -vespa_add_test(NAME jrt_test_echo-client_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/echo_test.sh) +vespa_add_test(NAME jrt_test_echo-client_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/echo_test.sh + DEPENDS jrt_test_echo-client_app) diff --git a/jrt_test/src/tests/mandatory-methods/CMakeLists.txt b/jrt_test/src/tests/mandatory-methods/CMakeLists.txt index 9f7665ec4b0..d3fdb32ce59 100644 --- a/jrt_test/src/tests/mandatory-methods/CMakeLists.txt +++ b/jrt_test/src/tests/mandatory-methods/CMakeLists.txt @@ -4,4 +4,5 @@ vespa_add_executable(jrt_test_extract-reflection_app TEST extract-reflection.cpp DEPENDS ) -vespa_add_test(NAME jrt_test_extract-reflection_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mandatory-methods_test.sh) +vespa_add_test(NAME jrt_test_extract-reflection_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mandatory-methods_test.sh + DEPENDS jrt_test_extract-reflection_app) diff --git a/jrt_test/src/tests/mockup-invoke/CMakeLists.txt b/jrt_test/src/tests/mockup-invoke/CMakeLists.txt index c5e484ea43c..26424f240e9 100644 --- a/jrt_test/src/tests/mockup-invoke/CMakeLists.txt +++ b/jrt_test/src/tests/mockup-invoke/CMakeLists.txt @@ -4,4 +4,5 @@ vespa_add_executable(jrt_test_mockup-server_app TEST mockup-server.cpp DEPENDS ) -vespa_add_test(NAME jrt_test_mockup-server_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mockup-invoke_test.sh) +vespa_add_test(NAME jrt_test_mockup-server_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mockup-invoke_test.sh + DEPENDS jrt_test_mockup-server_app) diff --git a/jrt_test/src/tests/rpc-error/CMakeLists.txt b/jrt_test/src/tests/rpc-error/CMakeLists.txt index fbe9720d55e..5802036a97e 100644 --- a/jrt_test/src/tests/rpc-error/CMakeLists.txt +++ b/jrt_test/src/tests/rpc-error/CMakeLists.txt @@ -4,4 +4,5 @@ vespa_add_executable(jrt_test_test-errors_app TEST test-errors.cpp DEPENDS ) -vespa_add_test(NAME jrt_test_test-errors_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rpc-error_test.sh) +vespa_add_test(NAME jrt_test_test-errors_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rpc-error_test.sh + DEPENDS jrt_test_test-errors_app) diff --git a/logd/src/tests/rotate/CMakeLists.txt b/logd/src/tests/rotate/CMakeLists.txt index 0398b14bcf4..db025dbea19 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 sh rotate_test.sh BENCHMARK) +vespa_add_test(NAME logd_rotate_test NO_VALGRIND COMMAND sh rotate_test.sh BENCHMARK + DEPENDS logd_dummyserver_app logd_dummylogger_app) diff --git a/lowercasing_test/src/tests/lowercasing/CMakeLists.txt b/lowercasing_test/src/tests/lowercasing/CMakeLists.txt index fcef0151729..15016b399c0 100644 --- a/lowercasing_test/src/tests/lowercasing/CMakeLists.txt +++ b/lowercasing_test/src/tests/lowercasing/CMakeLists.txt @@ -4,9 +4,10 @@ vespa_add_executable(lowercasing_test_casingvariants_fastlib_app TEST casingvariants_fastlib.cpp DEPENDS ) -vespa_add_test(NAME lowercasing_test_lowrcasing NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lowercasing_test.sh) vespa_add_executable(lowercasing_test_casingvariants_vespalib_app TEST SOURCES casingvariants_vespalib.cpp DEPENDS ) +vespa_add_test(NAME lowercasing_test_lowrcasing NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lowercasing_test.sh + DEPENDS lowercasing_test_casingvariants_fastlib_app lowercasing_test_casingvariants_vespalib_app) diff --git a/messagebus/test/src/tests/trace/CMakeLists.txt b/messagebus/test/src/tests/trace/CMakeLists.txt index b2c31e19ba7..af539fa2818 100644 --- a/messagebus/test/src/tests/trace/CMakeLists.txt +++ b/messagebus/test/src/tests/trace/CMakeLists.txt @@ -4,9 +4,10 @@ vespa_add_executable(messagebus_test_trace_test_app TEST trace.cpp DEPENDS ) -vespa_add_test(NAME messagebus_test_trace_test_app NO_VALGRIND COMMAND sh trace_test.sh) vespa_add_executable(messagebus_test_cpp-server-trace_app SOURCES cpp-server.cpp DEPENDS ) +vespa_add_test(NAME messagebus_test_trace_test_app NO_VALGRIND COMMAND sh trace_test.sh + DEPENDS messagebus_test_trace_test_app messagebus_test_cpp-server-trace_app) diff --git a/persistence/src/tests/proxy/CMakeLists.txt b/persistence/src/tests/proxy/CMakeLists.txt index 8a8a56fa935..14d19f6d4c6 100644 --- a/persistence/src/tests/proxy/CMakeLists.txt +++ b/persistence/src/tests/proxy/CMakeLists.txt @@ -27,4 +27,5 @@ vespa_add_executable(persistence_external_providerproxy_conformancetest_app persistence persistence_persistence_conformancetest ) -vespa_add_test(NAME persistence_providerproxy_conformance_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/proxy_test.sh) +vespa_add_test(NAME persistence_providerproxy_conformance_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/proxy_test.sh + DEPENDS persistence_providerstub_test_app persistence_providerproxy_test_app persistence_providerproxy_conformance_test_app) diff --git a/searchcore/src/tests/proton/attribute/CMakeLists.txt b/searchcore/src/tests/proton/attribute/CMakeLists.txt index 8fc96538d10..bd5f1937c54 100644 --- a/searchcore/src/tests/proton/attribute/CMakeLists.txt +++ b/searchcore/src/tests/proton/attribute/CMakeLists.txt @@ -8,7 +8,8 @@ vespa_add_executable(searchcore_attribute_test_app TEST searchcore_flushengine searchcore_pcommon ) -vespa_add_test(NAME searchcore_attribute_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/attribute_test.sh) +vespa_add_test(NAME searchcore_attribute_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/attribute_test.sh + DEPENDS searchcore_attribute_test_app) vespa_add_executable(searchcore_attributeflush_test_app TEST SOURCES attributeflush_test.cpp @@ -18,4 +19,5 @@ vespa_add_executable(searchcore_attributeflush_test_app TEST searchcore_flushengine searchcore_pcommon ) -vespa_add_test(NAME searchcore_attributeflush_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/attributeflush_test.sh) +vespa_add_test(NAME searchcore_attributeflush_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/attributeflush_test.sh + DEPENDS searchcore_attributeflush_test_app) diff --git a/searchcore/src/tests/proton/docsummary/CMakeLists.txt b/searchcore/src/tests/proton/docsummary/CMakeLists.txt index 8e2aa848ee4..61c2604046c 100644 --- a/searchcore/src/tests/proton/docsummary/CMakeLists.txt +++ b/searchcore/src/tests/proton/docsummary/CMakeLists.txt @@ -29,4 +29,5 @@ vespa_add_executable(searchcore_summaryfieldconverter_test_app DEPENDS searchcore_docsummary ) -vespa_add_test(NAME searchcore_docsummary_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/docsummary_test.sh) +vespa_add_test(NAME searchcore_docsummary_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/docsummary_test.sh + DEPENDS searchcore_docsummary_test_app searchcore_summaryfieldconverter_test_app) diff --git a/searchcore/src/tests/proton/documentdb/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/CMakeLists.txt index 28a4ca564ed..e8bbad7dfc2 100644 --- a/searchcore/src/tests/proton/documentdb/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/CMakeLists.txt @@ -21,4 +21,5 @@ vespa_add_executable(searchcore_documentdb_test_app TEST searchcore_fconfig searchcore_util ) -vespa_add_test(NAME searchcore_documentdb_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/documentdb_test.sh) +vespa_add_test(NAME searchcore_documentdb_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/documentdb_test.sh + DEPENDS searchcore_documentdb_test_app) diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt index 01386479d69..3237d348e12 100644 --- a/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt @@ -15,4 +15,5 @@ vespa_add_executable(searchcore_feedhandler_test_app TEST searchcore_util searchcore_fconfig ) -vespa_add_test(NAME searchcore_feedhandler_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/feedhandler_test.sh) +vespa_add_test(NAME searchcore_feedhandler_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/feedhandler_test.sh + DEPENDS searchcore_feedhandler_test_app) diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt index 7ab8882f339..d05675249c0 100644 --- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt @@ -7,5 +7,6 @@ vespa_add_executable(searchcore_fileconfigmanager_test_app TEST searchcore_pcommon searchcore_fconfig ) -vespa_add_test(NAME searchcore_fileconfigmanager_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/fileconfigmanager_test.sh) +vespa_add_test(NAME searchcore_fileconfigmanager_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/fileconfigmanager_test.sh + DEPENDS searchcore_fileconfigmanager_test_app) vespa_generate_config(searchcore_fileconfigmanager_test_app mycfg.def) diff --git a/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt b/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt index 9d3a2f1de23..ce2d89d6f50 100644 --- a/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt @@ -10,4 +10,5 @@ vespa_add_executable(searchcore_documentmetastore_test_app TEST searchcore_feedoperation searchcore_fconfig ) -vespa_add_test(NAME searchcore_documentmetastore_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/documentmetastore_test.sh) +vespa_add_test(NAME searchcore_documentmetastore_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/documentmetastore_test.sh + DEPENDS searchcore_documentmetastore_test_app) diff --git a/searchcore/src/tests/proton/index/CMakeLists.txt b/searchcore/src/tests/proton/index/CMakeLists.txt index 68064365b8a..50824a4d762 100644 --- a/searchcore/src/tests/proton/index/CMakeLists.txt +++ b/searchcore/src/tests/proton/index/CMakeLists.txt @@ -30,4 +30,5 @@ vespa_add_executable(searchcore_indexcollection_test_app TEST DEPENDS searchcore_index ) -vespa_add_test(NAME searchcore_index_test COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/index_test.sh) +vespa_add_test(NAME searchcore_index_test COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/index_test.sh + DEPENDS searchcore_indexmanager_test_app searchcore_fusionrunner_test_app searchcore_diskindexcleaner_test_app searchcore_indexcollection_test_app) diff --git a/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt b/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt index 71def96300f..b70ce32777a 100644 --- a/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt +++ b/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt @@ -4,4 +4,5 @@ vespa_add_executable(searchcore_verify_ranksetup_test_app TEST verify_ranksetup_test.cpp DEPENDS ) -vespa_add_test(NAME searchcore_verify_ranksetup_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/verify_ranksetup_test.sh) +vespa_add_test(NAME searchcore_verify_ranksetup_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/verify_ranksetup_test.sh + DEPENDS searchcore_verify_ranksetup_test_app) diff --git a/searchlib/src/tests/attribute/changevector/CMakeLists.txt b/searchlib/src/tests/attribute/changevector/CMakeLists.txt index 320120f6f2b..c221e46ef34 100644 --- a/searchlib/src/tests/attribute/changevector/CMakeLists.txt +++ b/searchlib/src/tests/attribute/changevector/CMakeLists.txt @@ -4,4 +4,5 @@ vespa_add_executable(searchlib_changevector_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_changevector_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/changevector_test.sh) +vespa_add_test(NAME searchlib_changevector_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/changevector_test.sh + DEPENDS searchlib_changevector_test_app) diff --git a/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt b/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt index 6ef33619dc4..db53bcd669b 100644 --- a/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt +++ b/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt @@ -5,4 +5,5 @@ vespa_add_executable(searchlib_extendattribute_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_extendattribute_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/extendattribute_test.sh) +vespa_add_test(NAME searchlib_extendattribute_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/extendattribute_test.sh + DEPENDS searchlib_extendattribute_test_app) diff --git a/searchlib/src/tests/attribute/guard/CMakeLists.txt b/searchlib/src/tests/attribute/guard/CMakeLists.txt index 8b5d7a6f08b..9253adb8540 100644 --- a/searchlib/src/tests/attribute/guard/CMakeLists.txt +++ b/searchlib/src/tests/attribute/guard/CMakeLists.txt @@ -5,4 +5,5 @@ vespa_add_executable(searchlib_attributeguard_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_attributeguard_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/attributeguard_test.sh) +vespa_add_test(NAME searchlib_attributeguard_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/attributeguard_test.sh + DEPENDS searchlib_attributeguard_test_app) diff --git a/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt b/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt index 4f93d552775..91a5330bd95 100644 --- a/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt +++ b/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt @@ -5,4 +5,5 @@ vespa_add_executable(searchlib_postinglistattribute_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_postinglistattribute_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/postinglistattribute_test.sh) +vespa_add_test(NAME searchlib_postinglistattribute_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/postinglistattribute_test.sh + DEPENDS searchlib_postinglistattribute_test_app) diff --git a/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt b/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt index d9f69fbd15b..7c866cf1ebc 100644 --- a/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt +++ b/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt @@ -6,4 +6,5 @@ vespa_add_executable(searchlib_searchcontext_test_app TEST searchlib searchlib_test ) -vespa_add_test(NAME searchlib_searchcontext_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/searchcontext_test.sh) +vespa_add_test(NAME searchlib_searchcontext_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/searchcontext_test.sh + DEPENDS searchlib_searchcontext_test_app) diff --git a/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt b/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt index 9491875b238..720e1541ef0 100644 --- a/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt +++ b/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt @@ -5,4 +5,5 @@ vespa_add_executable(searchlib_stringattribute_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_stringattribute_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/stringattribute_test.sh) +vespa_add_test(NAME searchlib_stringattribute_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/stringattribute_test.sh + DEPENDS searchlib_stringattribute_test_app) diff --git a/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt b/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt index fdd4570deff..9c566d0d041 100644 --- a/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt +++ b/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt @@ -5,4 +5,5 @@ vespa_add_executable(searchlib_tensorattribute_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_tensorattribute_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tensorattribute_test.sh) +vespa_add_test(NAME searchlib_tensorattribute_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tensorattribute_test.sh + DEPENDS searchlib_tensorattribute_test_app) diff --git a/searchlib/src/tests/datastore/CMakeLists.txt b/searchlib/src/tests/datastore/CMakeLists.txt index e617b221b24..353e2acde63 100644 --- a/searchlib/src/tests/datastore/CMakeLists.txt +++ b/searchlib/src/tests/datastore/CMakeLists.txt @@ -5,4 +5,5 @@ vespa_add_executable(searchlib_logdatastore_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_logdatastore_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/logdatastore_test.sh) +vespa_add_test(NAME searchlib_logdatastore_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/logdatastore_test.sh + DEPENDS searchlib_logdatastore_test_app) diff --git a/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt b/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt index e747871a5a4..d47ef101c71 100644 --- a/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt +++ b/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt @@ -6,4 +6,5 @@ vespa_add_executable(searchlib_fieldwriter_test_app TEST searchlib_test searchlib ) -vespa_add_test(NAME searchlib_fieldwriter_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/runtests.sh) +vespa_add_test(NAME searchlib_fieldwriter_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/runtests.sh + DEPENDS searchlib_fieldwriter_test_app) diff --git a/searchlib/src/tests/diskindex/fusion/CMakeLists.txt b/searchlib/src/tests/diskindex/fusion/CMakeLists.txt index 246ab3632e3..90c5f0520bd 100644 --- a/searchlib/src/tests/diskindex/fusion/CMakeLists.txt +++ b/searchlib/src/tests/diskindex/fusion/CMakeLists.txt @@ -7,4 +7,5 @@ vespa_add_executable(searchlib_fusion_test_app TEST AFTER searchlib_vespa-index-inspect_app ) -vespa_add_test(NAME searchlib_fusion_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/fusion_test.sh) +vespa_add_test(NAME searchlib_fusion_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/fusion_test.sh + DEPENDS searchlib_fusion_test_app) diff --git a/searchlib/src/tests/features/CMakeLists.txt b/searchlib/src/tests/features/CMakeLists.txt index 3bbcf61be12..d80026aaba9 100644 --- a/searchlib/src/tests/features/CMakeLists.txt +++ b/searchlib/src/tests/features/CMakeLists.txt @@ -9,7 +9,8 @@ vespa_add_executable(searchlib_prod_features_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_prod_features_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/prod_features_test.sh) +vespa_add_test(NAME searchlib_prod_features_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/prod_features_test.sh + DEPENDS searchlib_prod_features_test_app) vespa_add_executable(searchlib_featurebenchmark_app SOURCES featurebenchmark.cpp diff --git a/searchlib/src/tests/transactionlog/CMakeLists.txt b/searchlib/src/tests/transactionlog/CMakeLists.txt index 5275f30396d..f8cdae445a6 100644 --- a/searchlib/src/tests/transactionlog/CMakeLists.txt +++ b/searchlib/src/tests/transactionlog/CMakeLists.txt @@ -5,4 +5,5 @@ vespa_add_executable(searchlib_translogclient_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_translogclient_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/translogclient_test.sh) +vespa_add_test(NAME searchlib_translogclient_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/translogclient_test.sh + DEPENDS searchlib_translogclient_test_app) diff --git a/searchlib/src/tests/url/CMakeLists.txt b/searchlib/src/tests/url/CMakeLists.txt index 151b06e409b..024d11dd1e6 100644 --- a/searchlib/src/tests/url/CMakeLists.txt +++ b/searchlib/src/tests/url/CMakeLists.txt @@ -5,4 +5,5 @@ vespa_add_executable(searchlib_testurl_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_testurl_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/dotest.sh) +vespa_add_test(NAME searchlib_testurl_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/dotest.sh + DEPENDS searchlib_testurl_app) diff --git a/searchsummary/src/tests/extractkeywords/CMakeLists.txt b/searchsummary/src/tests/extractkeywords/CMakeLists.txt index b571793a015..7abce290666 100644 --- a/searchsummary/src/tests/extractkeywords/CMakeLists.txt +++ b/searchsummary/src/tests/extractkeywords/CMakeLists.txt @@ -5,4 +5,5 @@ vespa_add_executable(searchsummary_extractkeywordstest_app TEST DEPENDS searchsummary ) -vespa_add_test(NAME searchsummary_extractkeywordstest_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/runtests.sh) +vespa_add_test(NAME searchsummary_extractkeywordstest_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/runtests.sh + DEPENDS searchsummary_extractkeywordstest_app) diff --git a/slobrok/src/tests/startsome/CMakeLists.txt b/slobrok/src/tests/startsome/CMakeLists.txt index c4e64135d36..51ae234dc7f 100644 --- a/slobrok/src/tests/startsome/CMakeLists.txt +++ b/slobrok/src/tests/startsome/CMakeLists.txt @@ -4,9 +4,10 @@ vespa_add_executable(slobrok_tstdst_app TEST tstdst.cpp DEPENDS ) -vespa_add_test(NAME slobrok_tstdst_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/startsome.sh) vespa_add_executable(slobrok_rpc_info_app SOURCES rpc_info.cpp 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) 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) diff --git a/vespalib/src/tests/tutorial/CMakeLists.txt b/vespalib/src/tests/tutorial/CMakeLists.txt index 9ca6951525c..0a417b35b62 100644 --- a/vespalib/src/tests/tutorial/CMakeLists.txt +++ b/vespalib/src/tests/tutorial/CMakeLists.txt @@ -5,7 +5,8 @@ vespa_add_executable(vespalib_make_tutorial_app TEST DEPENDS vespalib ) -vespa_add_test(NAME vespalib_make_tutorial_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/compare-tutorials.sh) +vespa_add_test(NAME vespalib_make_tutorial_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/compare-tutorials.sh + DEPENDS vespalib_make_tutorial_app) vespa_add_executable(vespalib_xml_escape_app SOURCES xml_escape.cpp diff --git a/vespalog/src/test/CMakeLists.txt b/vespalog/src/test/CMakeLists.txt index e07dc1769d1..ffd0e843446 100644 --- a/vespalog/src/test/CMakeLists.txt +++ b/vespalog/src/test/CMakeLists.txt @@ -7,14 +7,16 @@ vespa_add_executable(vespalog_bufferedlogtest_app TEST DEPENDS vespalog ) -vespa_add_test(NAME vespalog_bufferedlogtest_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bufferedlogtest_test.sh) +vespa_add_test(NAME vespalog_bufferedlogtest_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bufferedlogtest_test.sh + DEPENDS vespalog_bufferedlogtest_app) vespa_add_executable(vespalog_bufferedlogskiptest_app TEST SOURCES bufferedlogskiptest.cpp DEPENDS vespalog ) -vespa_add_test(NAME vespalog_bufferedlogskiptest_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bufferedlogskiptest_test.sh) +vespa_add_test(NAME vespalog_bufferedlogskiptest_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bufferedlogskiptest_test.sh + DEPENDS vespalog_bufferedlogskiptest_app) vespa_add_executable(vespalog_rejectfiltertest_app TEST SOURCES rejectfiltertest.cpp 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) |