diff options
9 files changed, 27 insertions, 25 deletions
diff --git a/eval/src/tests/tensor/tensor_conformance/CMakeLists.txt b/eval/src/tests/tensor/tensor_conformance/CMakeLists.txt index 6b4fea4cb29..c883a592543 100644 --- a/eval/src/tests/tensor/tensor_conformance/CMakeLists.txt +++ b/eval/src/tests/tensor/tensor_conformance/CMakeLists.txt @@ -5,4 +5,4 @@ vespa_add_executable(eval_tensor_tensor_conformance_test_app TEST DEPENDS vespaeval ) -vespa_add_test(NAME eval_tensor_tensor_conformance_test_app COMMAND eval_tensor_tensor_conformance_test_app) +vespa_add_test(NAME eval_tensor_tensor_conformance_test_app COMMAND eval_tensor_tensor_conformance_test_app COST 150) diff --git a/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp b/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp index 2577b4e6155..dc5a7e74549 100644 --- a/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp +++ b/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp @@ -123,23 +123,28 @@ void perform_test(size_t thread_id, Client &client, Result &result) { CryptoEngine::SP null_crypto = std::make_shared<NullCryptoEngine>(); CryptoEngine::SP xor_crypto = std::make_shared<XorCryptoEngine>(); CryptoEngine::SP tls_crypto = std::make_shared<vespalib::TlsCryptoEngine>(vespalib::test::make_tls_options_for_testing()); +namespace { + uint32_t getNumThreads() { + return std::max(4u, std::thread::hardware_concurrency()); + } +} -TEST_MT_FFF("parallel rpc with 1/1 transport threads and 128 user threads (no encryption)", - 128, Server(null_crypto, 1), Client(null_crypto, 1, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } +TEST_MT_FFF("parallel rpc with 1/1 transport threads and num_cores user threads (no encryption)", + getNumThreads(), Server(null_crypto, 1), Client(null_crypto, 1, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } -TEST_MT_FFF("parallel rpc with 1/1 transport threads and 128 user threads (xor encryption)", - 128, Server(xor_crypto, 1), Client(xor_crypto, 1, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } +TEST_MT_FFF("parallel rpc with 1/1 transport threads and num_cores user threads (xor encryption)", + getNumThreads(), Server(xor_crypto, 1), Client(xor_crypto, 1, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } -TEST_MT_FFF("parallel rpc with 1/1 transport threads and 128 user threads (tls encryption)", - 128, Server(tls_crypto, 1), Client(tls_crypto, 1, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } +TEST_MT_FFF("parallel rpc with 1/1 transport threads and num_cores user threads (tls encryption)", + getNumThreads(), Server(tls_crypto, 1), Client(tls_crypto, 1, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } -TEST_MT_FFF("parallel rpc with 8/8 transport threads and 128 user threads (no encryption)", - 128, Server(null_crypto, 8), Client(null_crypto, 8, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } +TEST_MT_FFF("parallel rpc with 8/8 transport threads and num_cores user threads (no encryption)", + getNumThreads(), Server(null_crypto, 8), Client(null_crypto, 8, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } -TEST_MT_FFF("parallel rpc with 8/8 transport threads and 128 user threads (xor encryption)", - 128, Server(xor_crypto, 8), Client(xor_crypto, 8, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } +TEST_MT_FFF("parallel rpc with 8/8 transport threads and num_cores user threads (xor encryption)", + getNumThreads(), Server(xor_crypto, 8), Client(xor_crypto, 8, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } -TEST_MT_FFF("parallel rpc with 8/8 transport threads and 128 user threads (tls encryption)", - 128, Server(tls_crypto, 8), Client(tls_crypto, 8, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } +TEST_MT_FFF("parallel rpc with 8/8 transport threads and num_cores user threads (tls encryption)", + getNumThreads(), Server(tls_crypto, 8), Client(tls_crypto, 8, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } TEST_MAIN() { TEST_RUN_ALL(); } diff --git a/searchlib/src/tests/attribute/enum_attribute_compaction/CMakeLists.txt b/searchlib/src/tests/attribute/enum_attribute_compaction/CMakeLists.txt index 4d062fd233b..917ec162070 100644 --- a/searchlib/src/tests/attribute/enum_attribute_compaction/CMakeLists.txt +++ b/searchlib/src/tests/attribute/enum_attribute_compaction/CMakeLists.txt @@ -6,4 +6,4 @@ vespa_add_executable(searchlib_enum_attribute_compaction_test_app TEST searchlib GTest::GTest ) -vespa_add_test(NAME searchlib_enum_attribute_compaction_test_app COMMAND searchlib_enum_attribute_compaction_test_app) +vespa_add_test(NAME searchlib_enum_attribute_compaction_test_app COMMAND searchlib_enum_attribute_compaction_test_app COST 100) diff --git a/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt b/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt index 377d91bf634..df1fe25a14c 100644 --- a/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt +++ b/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt @@ -7,4 +7,4 @@ vespa_add_executable(searchlib_searchcontext_test_app TEST searchlib_test ) vespa_add_test(NAME searchlib_searchcontext_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/searchcontext_test.sh - DEPENDS searchlib_searchcontext_test_app) + DEPENDS searchlib_searchcontext_test_app COST 100) diff --git a/searchlib/src/tests/features/CMakeLists.txt b/searchlib/src/tests/features/CMakeLists.txt index 43e88dafcdd..81a7959cc52 100644 --- a/searchlib/src/tests/features/CMakeLists.txt +++ b/searchlib/src/tests/features/CMakeLists.txt @@ -10,7 +10,7 @@ vespa_add_executable(searchlib_prod_features_test_app TEST searchlib ) vespa_add_test(NAME searchlib_prod_features_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/prod_features_test.sh - DEPENDS searchlib_prod_features_test_app) + DEPENDS searchlib_prod_features_test_app COST 80) vespa_add_executable(searchlib_featurebenchmark_app SOURCES featurebenchmark.cpp diff --git a/storage/src/tests/persistence/filestorage/CMakeLists.txt b/storage/src/tests/persistence/filestorage/CMakeLists.txt index fc289a4c30f..7bd74b83786 100644 --- a/storage/src/tests/persistence/filestorage/CMakeLists.txt +++ b/storage/src/tests/persistence/filestorage/CMakeLists.txt @@ -19,7 +19,4 @@ vespa_add_executable(storage_filestorage_gtest_runner_app TEST GTest::GTest ) -vespa_add_test( - NAME storage_filestorage_gtest_runner_app - COMMAND storage_filestorage_gtest_runner_app -) +vespa_add_test( NAME storage_filestorage_gtest_runner_app COMMAND storage_filestorage_gtest_runner_app COST 50) diff --git a/vespalib/src/tests/btree/CMakeLists.txt b/vespalib/src/tests/btree/CMakeLists.txt index b6bdcb5160e..23ad632b77b 100644 --- a/vespalib/src/tests/btree/CMakeLists.txt +++ b/vespalib/src/tests/btree/CMakeLists.txt @@ -5,21 +5,21 @@ vespa_add_executable(vespalib_btree_test_app TEST DEPENDS vespalib ) -vespa_add_test(NAME vespalib_btree_test_app COMMAND vespalib_btree_test_app) +vespa_add_test(NAME vespalib_btree_test_app COMMAND vespalib_btree_test_app COST 30) vespa_add_executable(vespalib_frozenbtree_test_app TEST SOURCES frozenbtree_test.cpp DEPENDS vespalib ) -vespa_add_test(NAME vespalib_frozenbtree_test_app COMMAND vespalib_frozenbtree_test_app) +vespa_add_test(NAME vespalib_frozenbtree_test_app COMMAND vespalib_frozenbtree_test_app COST 30) vespa_add_executable(vespalib_btreeaggregation_test_app TEST SOURCES btreeaggregation_test.cpp DEPENDS vespalib ) -vespa_add_test(NAME vespalib_btreeaggregation_test_app COMMAND vespalib_btreeaggregation_test_app) +vespa_add_test(NAME vespalib_btreeaggregation_test_app COMMAND vespalib_btreeaggregation_test_app COST 30) vespa_add_executable(vespalib_iteratespeed_app SOURCES iteratespeed.cpp diff --git a/vespalib/src/tests/child_process/CMakeLists.txt b/vespalib/src/tests/child_process/CMakeLists.txt index 1c9af730510..f0b078d2dfc 100644 --- a/vespalib/src/tests/child_process/CMakeLists.txt +++ b/vespalib/src/tests/child_process/CMakeLists.txt @@ -5,4 +5,4 @@ vespa_add_executable(vespalib_child_process_test_app TEST DEPENDS vespalib ) -vespa_add_test(NAME vespalib_child_process_test_app COMMAND vespalib_child_process_test_app) +vespa_add_test(NAME vespalib_child_process_test_app COMMAND vespalib_child_process_test_app COST 30) diff --git a/vespalib/src/tests/left_right_heap/CMakeLists.txt b/vespalib/src/tests/left_right_heap/CMakeLists.txt index 9b435a46496..d2eac4f1802 100644 --- a/vespalib/src/tests/left_right_heap/CMakeLists.txt +++ b/vespalib/src/tests/left_right_heap/CMakeLists.txt @@ -5,7 +5,7 @@ vespa_add_executable(vespalib_left_right_heap_test_app TEST DEPENDS vespalib ) -vespa_add_test(NAME vespalib_left_right_heap_test_app COMMAND vespalib_left_right_heap_test_app) +vespa_add_test(NAME vespalib_left_right_heap_test_app COMMAND vespalib_left_right_heap_test_app COST 30) vespa_add_executable(vespalib_left_right_heap_bench_app SOURCES left_right_heap_bench.cpp |