diff options
| -rw-r--r-- | eval/src/tests/eval/compiled_function/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | eval/src/tests/eval/gbdt/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | functions.cmake | 9 | ||||
| -rw-r--r-- | metrics/src/tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | searchcore/src/tests/proton/persistenceconformance/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | searchlib/src/tests/attribute/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | searchlib/src/tests/attribute/bitvector/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/src/tests/distributor/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/src/tests/storageserver/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | vdslib/src/tests/CMakeLists.txt | 1 |
11 files changed, 17 insertions, 7 deletions
diff --git a/eval/src/tests/eval/compiled_function/CMakeLists.txt b/eval/src/tests/eval/compiled_function/CMakeLists.txt index c0f01853836..bb1b5e27862 100644 --- a/eval/src/tests/eval/compiled_function/CMakeLists.txt +++ b/eval/src/tests/eval/compiled_function/CMakeLists.txt @@ -5,4 +5,4 @@ vespa_add_executable(eval_compiled_function_test_app TEST DEPENDS vespaeval ) -vespa_add_test(NAME eval_compiled_function_test_app COMMAND eval_compiled_function_test_app) +vespa_add_test(NAME eval_compiled_function_test_app COMMAND eval_compiled_function_test_app COST 400) diff --git a/eval/src/tests/eval/gbdt/CMakeLists.txt b/eval/src/tests/eval/gbdt/CMakeLists.txt index 874a2d7bd02..e79d21989ea 100644 --- a/eval/src/tests/eval/gbdt/CMakeLists.txt +++ b/eval/src/tests/eval/gbdt/CMakeLists.txt @@ -5,7 +5,7 @@ vespa_add_executable(eval_gbdt_test_app TEST DEPENDS vespaeval ) -vespa_add_test(NAME eval_gbdt_test_app COMMAND eval_gbdt_test_app) +vespa_add_test(NAME eval_gbdt_test_app COMMAND eval_gbdt_test_app COST 600) vespa_add_executable(eval_gbdt_benchmark_app SOURCES gbdt_benchmark.cpp diff --git a/functions.cmake b/functions.cmake index 95828430768..65945680772 100644 --- a/functions.cmake +++ b/functions.cmake @@ -403,7 +403,7 @@ function(__is_command_a_script COMMAND RESULT_VAR) endfunction() function(vespa_add_test) - cmake_parse_arguments(ARG "NO_VALGRIND;RUN_SERIAL;BENCHMARK" "NAME;WORKING_DIRECTORY;ENVIRONMENT" "COMMAND;DEPENDS" ${ARGN}) + cmake_parse_arguments(ARG "NO_VALGRIND;RUN_SERIAL;BENCHMARK" "NAME;WORKING_DIRECTORY;ENVIRONMENT;COST" "COMMAND;DEPENDS" ${ARGN}) if(NOT RUN_BENCHMARKS AND ARG_BENCHMARK) return() @@ -454,8 +454,13 @@ function(vespa_add_test) list(APPEND ARG_ENVIRONMENT "SOURCE_DIRECTORY=${CMAKE_CURRENT_SOURCE_DIR}") set_tests_properties(${ARG_NAME} PROPERTIES ENVIRONMENT "${ARG_ENVIRONMENT}") + + if (ARG_COST) + set_tests_properties(${ARG_NAME} PROPERTIES COST ${ARG_COST}) + endif() + if(ARG_RUN_SERIAL) - set_tests_properties(${TEST_NAME} PROPERTIES RUN_SERIAL TRUE) + set_tests_properties(${ARG_NAME} PROPERTIES RUN_SERIAL TRUE) endif() if (AUTORUN_UNIT_TESTS) diff --git a/metrics/src/tests/CMakeLists.txt b/metrics/src/tests/CMakeLists.txt index 2b1e2771be0..1e3578e065b 100644 --- a/metrics/src/tests/CMakeLists.txt +++ b/metrics/src/tests/CMakeLists.txt @@ -23,5 +23,6 @@ vespa_add_executable(metrics_gtest_runner_app TEST vespa_add_test( NAME metrics_gtest_runner_app COMMAND metrics_gtest_runner_app + COST 200 ) diff --git a/searchcore/src/tests/proton/persistenceconformance/CMakeLists.txt b/searchcore/src/tests/proton/persistenceconformance/CMakeLists.txt index 9f34fdc794f..6bda19b77a3 100644 --- a/searchcore/src/tests/proton/persistenceconformance/CMakeLists.txt +++ b/searchcore/src/tests/proton/persistenceconformance/CMakeLists.txt @@ -3,4 +3,5 @@ vespa_add_test( NAME searchcore_persistenceconformance_test_app COMMAND searchcore_persistenceconformance_test_app ENVIRONMENT "VESPA_LOG_TARGET=file:vlog.txt" + COST 200 ) diff --git a/searchlib/src/tests/attribute/CMakeLists.txt b/searchlib/src/tests/attribute/CMakeLists.txt index 46d3bbe2531..395631be026 100644 --- a/searchlib/src/tests/attribute/CMakeLists.txt +++ b/searchlib/src/tests/attribute/CMakeLists.txt @@ -5,4 +5,4 @@ vespa_add_executable(searchlib_attribute_test_app TEST DEPENDS searchlib ) -vespa_add_test(NAME searchlib_attribute_test_app COMMAND searchlib_attribute_test_app) +vespa_add_test(NAME searchlib_attribute_test_app COMMAND searchlib_attribute_test_app COST 250) diff --git a/searchlib/src/tests/attribute/bitvector/CMakeLists.txt b/searchlib/src/tests/attribute/bitvector/CMakeLists.txt index 34ee458c782..e12fb7d8ca1 100644 --- a/searchlib/src/tests/attribute/bitvector/CMakeLists.txt +++ b/searchlib/src/tests/attribute/bitvector/CMakeLists.txt @@ -6,4 +6,4 @@ vespa_add_executable(searchlib_bitvector_test_app TEST searchlib searchlib_test ) -vespa_add_test(NAME searchlib_bitvector_test_app COMMAND searchlib_bitvector_test_app) +vespa_add_test(NAME searchlib_bitvector_test_app COMMAND searchlib_bitvector_test_app COST 200) diff --git a/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt b/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt index b8666524c51..c920b7d3b3b 100644 --- a/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt +++ b/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt @@ -6,4 +6,4 @@ vespa_add_executable(searchlib_fieldwriter_test_app TEST searchlib_test searchlib ) -vespa_add_test(NAME searchlib_fieldwriter_test_app COMMAND searchlib_fieldwriter_test_app) +vespa_add_test(NAME searchlib_fieldwriter_test_app COMMAND searchlib_fieldwriter_test_app COST 200) diff --git a/storage/src/tests/distributor/CMakeLists.txt b/storage/src/tests/distributor/CMakeLists.txt index ac8d2c934ec..1e70b6a4881 100644 --- a/storage/src/tests/distributor/CMakeLists.txt +++ b/storage/src/tests/distributor/CMakeLists.txt @@ -54,4 +54,5 @@ vespa_add_executable(storage_distributor_gtest_runner_app TEST vespa_add_test( NAME storage_distributor_gtest_runner_app COMMAND storage_distributor_gtest_runner_app + COST 350 ) diff --git a/storage/src/tests/storageserver/CMakeLists.txt b/storage/src/tests/storageserver/CMakeLists.txt index 42840382bbb..e49a69414b7 100644 --- a/storage/src/tests/storageserver/CMakeLists.txt +++ b/storage/src/tests/storageserver/CMakeLists.txt @@ -31,4 +31,5 @@ vespa_add_executable(storage_storageserver_gtest_runner_app TEST vespa_add_test( NAME storage_storageserver_gtest_runner_app COMMAND storage_storageserver_gtest_runner_app + COST 300 ) diff --git a/vdslib/src/tests/CMakeLists.txt b/vdslib/src/tests/CMakeLists.txt index ba5f0f9c08d..bc230a7157b 100644 --- a/vdslib/src/tests/CMakeLists.txt +++ b/vdslib/src/tests/CMakeLists.txt @@ -17,4 +17,5 @@ vespa_add_executable(vdslib_gtest_runner_app TEST vespa_add_test( NAME vdslib_gtest_runner_app COMMAND vdslib_gtest_runner_app + COST 300 ) |