From 65776d31120f1a5d5f4dd546de75d43d9b3cd6b4 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 --- cmake/modules/AddCephTest.cmake | 2 +- src/test/common/CMakeLists.txt | 2 +- src/test/crimson/CMakeLists.txt | 33 ++++++++++++------------ src/test/crimson/seastore/CMakeLists.txt | 12 ++++----- 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake index e7592aafacad6..af54e8a9c1a33 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 7387965b36c05..afa9d2065d23d 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 d6abfa64d0b79..3f637b7feb91c 100644 --- a/src/test/crimson/CMakeLists.txt +++ b/src/test/crimson/CMakeLists.txt @@ -5,13 +5,13 @@ add_executable(unittest-crimson-backfill ${PROJECT_SOURCE_DIR}/src/crimson/osd/backfill_state.cc ${PROJECT_SOURCE_DIR}/src/osd/recovery_types.cc) add_ceph_unittest(unittest-crimson-backfill - unittest-crimson-backfill --memory 256M --smp 1) + --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 @@ -20,13 +20,13 @@ add_ceph_unittest(unittest-seastar-denc --memory 256M --smp 1) 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) @@ -42,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 --smp 4) +add_ceph_unittest(unittest-seastar-config + --memory 256M --smp 4) target_link_libraries(unittest-seastar-config crimson) add_executable(unittest-seastar-monc @@ -60,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 @@ -77,7 +78,7 @@ add_executable(unittest_interruptible_future test_interruptible_future.cc gtest_seastar.cc) add_ceph_unittest(unittest_interruptible_future - unittest_interruptible_future --memory 256M --smp 1) + --memory 256M --smp 1) target_link_libraries( unittest_interruptible_future crimson-common) @@ -95,4 +96,4 @@ target_link_libraries( unittest-seastar-errorator crimson::gtest) add_ceph_unittest(unittest-seastar-errorator - unittest-seastar-errorator --memory 256M --smp 1) + --memory 256M --smp 1) diff --git a/src/test/crimson/seastore/CMakeLists.txt b/src/test/crimson/seastore/CMakeLists.txt index 28ad5a67f856a..7b58c8a14b1e3 100644 --- a/src/test/crimson/seastore/CMakeLists.txt +++ b/src/test/crimson/seastore/CMakeLists.txt @@ -3,7 +3,7 @@ add_executable(unittest-transaction-manager test_transaction_manager.cc ../gtest_seastar.cc) add_ceph_unittest(unittest-transaction-manager - unittest-seastar-socket --memory 256M --smp 1) + --memory 256M --smp 1) target_link_libraries( unittest-transaction-manager ${CMAKE_DL_LIBS} @@ -13,7 +13,7 @@ add_executable(unittest-btree-lba-manager test_btree_lba_manager.cc ../gtest_seastar.cc) add_ceph_unittest(unittest-btree-lba-manager - unittest-btree-lba-manager --memory 256M --smp 1) + --memory 256M --smp 1) target_link_libraries( unittest-btree-lba-manager ${CMAKE_DL_LIBS} @@ -41,7 +41,7 @@ target_link_libraries( add_executable(unittest-extmap-manager test_extmap_manager.cc ../gtest_seastar.cc) -add_ceph_unittest(unittest-extmap-manager +add_ceph_test(unittest-extmap-manager unittest-extmap-manager --memory 256M --smp 1) target_link_libraries( unittest-extmap-manager @@ -53,7 +53,7 @@ target_link_libraries( add_executable(unittest-collection-manager test_collection_manager.cc ../gtest_seastar.cc) -add_ceph_unittest(unittest-collection-manager +add_ceph_test(unittest-collection-manager unittest-collection-manager --memory 256M --smp 1) target_link_libraries( unittest-collection-manager @@ -66,7 +66,7 @@ add_executable(unittest-omap-manager test_omap_manager.cc ../gtest_seastar.cc) add_ceph_unittest(unittest-omap-manager - unittest-omap-manager --memory 256M --smp 1) + --memory 256M --smp 1) target_link_libraries( unittest-omap-manager ${CMAKE_DL_LIBS} @@ -76,7 +76,7 @@ add_executable(unittest-seastore test_seastore.cc ../gtest_seastar.cc) add_ceph_unittest(unittest-seastore - unittest-seastore --memory 256M --smp 1) + --memory 256M --smp 1) target_link_libraries( unittest-seastore ${CMAKE_DL_LIBS} -- 2.39.5