From 2cb2cd33dd8a8c5e0c5588ac49eec916e3f88406 Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Wed, 30 Oct 2019 17:51:56 +0800 Subject: [PATCH] test/crimson: move msgr perf tool to src/tools/crimson Do not disable targets perf_crimson_msgr and perf_async_msgr when WITH_TESTS=OFF Signed-off-by: Yingxin Cheng --- src/test/crimson/CMakeLists.txt | 6 ------ src/tools/CMakeLists.txt | 4 ++++ src/tools/crimson/CMakeLists.txt | 5 +++++ src/{test => tools}/crimson/perf_async_msgr.cc | 0 src/{test => tools}/crimson/perf_crimson_msgr.cc | 0 5 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 src/tools/crimson/CMakeLists.txt rename src/{test => tools}/crimson/perf_async_msgr.cc (100%) rename src/{test => tools}/crimson/perf_crimson_msgr.cc (100%) diff --git a/src/test/crimson/CMakeLists.txt b/src/test/crimson/CMakeLists.txt index 1284f44e53d54..4ba92ddc792b7 100644 --- a/src/test/crimson/CMakeLists.txt +++ b/src/test/crimson/CMakeLists.txt @@ -22,12 +22,6 @@ target_link_libraries(unittest_seastar_messenger crimson) add_executable(test_seastar_messenger_peer test_messenger_peer.cc) target_link_libraries(test_seastar_messenger_peer ceph-common global ${ALLOC_LIBS}) -add_executable(perf_crimson_msgr perf_crimson_msgr.cc) -target_link_libraries(perf_crimson_msgr crimson) - -add_executable(perf_async_msgr perf_async_msgr.cc) -target_link_libraries(perf_async_msgr ceph-common global ${ALLOC_LIBS}) - add_executable(unittest_seastar_echo test_alien_echo.cc) target_link_libraries(unittest_seastar_echo crimson) diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index f224bc7f46c64..0f8120a777522 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -122,5 +122,9 @@ if(WITH_RBD) endif() endif(WITH_RBD) +if(WITH_SEASTAR) + add_subdirectory(crimson) +endif() + add_subdirectory(immutable_object_cache) add_subdirectory(ceph-dencoder) diff --git a/src/tools/crimson/CMakeLists.txt b/src/tools/crimson/CMakeLists.txt new file mode 100644 index 0000000000000..fb4baf7a94aea --- /dev/null +++ b/src/tools/crimson/CMakeLists.txt @@ -0,0 +1,5 @@ +add_executable(perf_crimson_msgr perf_crimson_msgr.cc) +target_link_libraries(perf_crimson_msgr crimson) + +add_executable(perf_async_msgr perf_async_msgr.cc) +target_link_libraries(perf_async_msgr ceph-common global ${ALLOC_LIBS}) diff --git a/src/test/crimson/perf_async_msgr.cc b/src/tools/crimson/perf_async_msgr.cc similarity index 100% rename from src/test/crimson/perf_async_msgr.cc rename to src/tools/crimson/perf_async_msgr.cc diff --git a/src/test/crimson/perf_crimson_msgr.cc b/src/tools/crimson/perf_crimson_msgr.cc similarity index 100% rename from src/test/crimson/perf_crimson_msgr.cc rename to src/tools/crimson/perf_crimson_msgr.cc -- 2.39.5