From 01404b104ec6125c446a097b2041e672a347b0e7 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 30 Mar 2021 16:18:48 +0800 Subject: [PATCH] cmake: pass unparsed args to add_ceph_test() this allows us to pass extra argument to the script or executable to further customize its behavior when testing. also fix all the callers of add_ceph_unittest(), as there is no need to repeat the executable, which is also used as the name of the test. Signed-off-by: Kefu Chai (cherry picked from commit 65776d31120f1a5d5f4dd546de75d43d9b3cd6b4) Conflicts: src/test/crimson/CMakeLists.txt src/test/crimson/seastore/CMakeLists.txt: trivial resolution --- cmake/modules/AddCephTest.cmake | 2 +- src/test/common/CMakeLists.txt | 2 +- src/test/crimson/CMakeLists.txt | 33 ++++++++++--------- src/test/crimson/seastore/CMakeLists.txt | 9 +++-- .../seastore/onode_tree/CMakeLists.txt | 6 ++-- 5 files changed, 30 insertions(+), 22 deletions(-) diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake index 8d800444c7438..d26d003c779b7 100644 --- a/cmake/modules/AddCephTest.cmake +++ b/cmake/modules/AddCephTest.cmake @@ -50,7 +50,7 @@ function(add_ceph_unittest unittest_name) if(WITH_GTEST_PARALLEL AND UT_PARALLEL) set(UNITTEST ${GTEST_PARALLEL_COMMAND} ${UNITTEST}) endif() - add_ceph_test(${unittest_name} "${UNITTEST}") + add_ceph_test(${unittest_name} "${UNITTEST}" ${UT_UNPARSED_ARGUMENTS}) target_link_libraries(${unittest_name} ${UNITTEST_LIBS}) endfunction() diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt index a9508f3ceef70..e8db155f4ea7b 100644 --- a/src/test/common/CMakeLists.txt +++ b/src/test/common/CMakeLists.txt @@ -20,7 +20,7 @@ if(HAVE_BLKID AND LINUX) # unittest_blkdev add_executable(unittest_blkdev test_blkdev.cc) - add_ceph_unittest(unittest_blkdev ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_blkdev) + add_ceph_unittest(unittest_blkdev) target_link_libraries(unittest_blkdev global ${BLKID_LIBRARIES}) endif() diff --git a/src/test/crimson/CMakeLists.txt b/src/test/crimson/CMakeLists.txt index bc624ce672ed5..dd01a7109a3ba 100644 --- a/src/test/crimson/CMakeLists.txt +++ b/src/test/crimson/CMakeLists.txt @@ -4,13 +4,14 @@ add_executable(unittest-crimson-backfill ${PROJECT_SOURCE_DIR}/src/auth/Crypto.cc ${PROJECT_SOURCE_DIR}/src/crimson/osd/backfill_state.cc ${PROJECT_SOURCE_DIR}/src/osd/recovery_types.cc) -add_ceph_unittest(unittest-crimson-backfill) +add_ceph_unittest(unittest-crimson-backfill + --memory 256M --smp 1) target_link_libraries(unittest-crimson-backfill crimson GTest::Main) add_executable(unittest-seastar-buffer test_buffer.cc) -add_ceph_test(unittest-seastar-buffer - unittest-seastar-buffer --memory 256M --smp 1) +add_ceph_unittest(unittest-seastar-buffer + --memory 256M --smp 1) target_link_libraries(unittest-seastar-buffer crimson) add_executable(unittest-seastar-denc @@ -19,13 +20,13 @@ add_ceph_unittest(unittest-seastar-denc) target_link_libraries(unittest-seastar-denc crimson GTest::Main) add_executable(unittest-seastar-socket test_socket.cc) -add_ceph_test(unittest-seastar-socket - unittest-seastar-socket --memory 256M --smp 2) +add_ceph_unittest(unittest-seastar-socket + --memory 256M --smp 2) target_link_libraries(unittest-seastar-socket crimson) add_executable(unittest-seastar-messenger test_messenger.cc) -add_ceph_test(unittest-seastar-messenger - unittest-seastar-messenger --memory 256M --smp 1) +add_ceph_unittest(unittest-seastar-messenger + --memory 256M --smp 1) target_link_libraries(unittest-seastar-messenger crimson) add_executable(test-seastar-messenger-peer test_messenger_peer.cc) @@ -41,16 +42,16 @@ target_link_libraries(test-async-echo ceph-common global) add_executable(unittest-seastar-alienstore-thread-pool test_alienstore_thread_pool.cc) -add_ceph_test(unittest-seastar-alienstore-thread-pool - unittest-seastar-alienstore-thread-pool --memory 256M --smp 1) +add_ceph_unittest(unittest-seastar-alienstore-thread-pool + --memory 256M --smp 1) target_link_libraries(unittest-seastar-alienstore-thread-pool crimson-alienstore crimson) add_executable(unittest-seastar-config test_config.cc) -add_ceph_test(unittest-seastar-config - unittest-seastar-config --memory 256M) +add_ceph_unittest(unittest-seastar-config + --memory 256M --smp 4) target_link_libraries(unittest-seastar-config crimson) add_executable(unittest-seastar-monc @@ -59,13 +60,14 @@ target_link_libraries(unittest-seastar-monc crimson) add_executable(unittest-seastar-perfcounters test_perfcounters.cc) -add_ceph_test(unittest-seastar-perfcounters - unittest-seastar-perfcounters --memory 256M --smp 1) +add_ceph_unittest(unittest-seastar-perfcounters + --memory 256M --smp 1) target_link_libraries(unittest-seastar-perfcounters crimson) add_executable(unittest-seastar-lru test_lru.cc) -add_ceph_unittest(unittest-seastar-lru --memory 256M --smp 1) +add_ceph_unittest(unittest-seastar-lru + --memory 256M --smp 1) target_link_libraries(unittest-seastar-lru crimson GTest::Main) add_executable(unittest-fixed-kv-node-layout @@ -84,4 +86,5 @@ add_executable(unittest-seastar-errorator target_link_libraries( unittest-seastar-errorator crimson::gtest) -add_ceph_unittest(unittest-seastar-errorator) +add_ceph_unittest(unittest-seastar-errorator + --memory 256M --smp 1) diff --git a/src/test/crimson/seastore/CMakeLists.txt b/src/test/crimson/seastore/CMakeLists.txt index 73feebe23c2b7..2f79ca546ae69 100644 --- a/src/test/crimson/seastore/CMakeLists.txt +++ b/src/test/crimson/seastore/CMakeLists.txt @@ -2,7 +2,8 @@ add_executable(unittest-transaction-manager test_block.cc test_transaction_manager.cc ../gtest_seastar.cc) -add_ceph_unittest(unittest-transaction-manager) +add_ceph_unittest(unittest-transaction-manager + --memory 256M --smp 1) target_link_libraries( unittest-transaction-manager ${CMAKE_DL_LIBS} @@ -11,7 +12,8 @@ target_link_libraries( add_executable(unittest-btree-lba-manager test_btree_lba_manager.cc ../gtest_seastar.cc) -add_ceph_unittest(unittest-btree-lba-manager) +add_ceph_unittest(unittest-btree-lba-manager + --memory 256M --smp 1) target_link_libraries( unittest-btree-lba-manager ${CMAKE_DL_LIBS} @@ -39,7 +41,8 @@ target_link_libraries( add_executable(unittest-extmap-manager test_extmap_manager.cc ../gtest_seastar.cc) -add_ceph_unittest(unittest-extmap-manager) +add_ceph_unittest(unittest-extmap-manager + --memory 256M --smp 1) target_link_libraries( unittest-extmap-manager ${CMAKE_DL_LIBS} diff --git a/src/test/crimson/seastore/onode_tree/CMakeLists.txt b/src/test/crimson/seastore/onode_tree/CMakeLists.txt index 1f4718db067e0..0886d2fb69858 100644 --- a/src/test/crimson/seastore/onode_tree/CMakeLists.txt +++ b/src/test/crimson/seastore/onode_tree/CMakeLists.txt @@ -1,6 +1,7 @@ add_executable(test-seastore-onode-tree-node test_node.cc) -add_ceph_unittest(test-seastore-onode-tree-node) +add_ceph_unittest(test-seastore-onode-tree-node + --memory 256M --smp 1) target_link_libraries(test-seastore-onode-tree-node crimson-seastore GTest::Main) @@ -8,6 +9,7 @@ target_link_libraries(test-seastore-onode-tree-node add_executable(unittest-staged-fltree test_staged_fltree.cc ../../gtest_seastar.cc) -add_ceph_unittest(unittest-staged-fltree) +add_ceph_unittest(unittest-staged-fltree + --memory 256M --smp 1) target_link_libraries(unittest-staged-fltree crimson-seastore) -- 2.47.3