From 04ad36f4872397c5d33ce99e5da5a26dc63b95bd Mon Sep 17 00:00:00 2001 From: Elvin Sindrilaru Date: Tue, 3 Dec 2024 15:53:27 +0100 Subject: [PATCH] DEBIAN: Add test binaries to the Debian packages --- CMakeLists.txt | 3 ++- test/CMakeLists.txt | 48 +++++++++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dacd096a3..86ef56a3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,6 +139,7 @@ add_subdirectory(fst) add_subdirectory(console) add_subdirectory(fusex) add_subdirectory(misc) +add_subdirectory(test) if (GRPC_FOUND) add_subdirectory(client) @@ -146,7 +147,7 @@ endif() if (NOT CLIENT) add_subdirectory(namespace/ns_quarkdb/qclient) - add_subdirectory(test) + add_subdirectory(mq) add_subdirectory(mgm) add_subdirectory(namespace) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 655a58e8b..f28442a4e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -145,26 +145,31 @@ target_link_libraries(threadpooltest PRIVATE EosCommon) #------------------------------------------------------------------------------- # MQ test related executables #------------------------------------------------------------------------------- -add_executable(eos-shared-hash-test mq/SharedHashLoadTest.cc) -add_executable(xrdmqclienttest mq/XrdMqClientTest.cc) -add_executable(eos-mq-dumper mq/XrdMqQueueDumper.cc) -add_executable(eos-mq-feeder mq/XrdMqQueueFeeder.cc) -add_executable(xrdmqinjection mq/XrdMqQueueInjection.cc) -add_executable(xrdmqclientmaster mq/XrdMqClientMaster.cc) -add_executable(xrdmqclientworker mq/XrdMqClientWorker.cc) -add_executable(xrdmqsharedobjectclient mq/XrdMqSharedObjectClient.cc) -add_executable(xrdmqsharedobjectqueueclient mq/XrdMqSharedObjectQueueClient.cc) -add_executable(xrdmqsharedobjectbroadcastclient mq/XrdMqSharedObjectBroadCastClient.cc) -target_link_libraries(eos-shared-hash-test PRIVATE XrdMqClient-Static qclient) -target_link_libraries(xrdmqclienttest PRIVATE XrdMqClient-Static) -target_link_libraries(eos-mq-dumper PRIVATE XrdMqClient-Static) -target_link_libraries(eos-mq-feeder PRIVATE XrdMqClient-Static) -target_link_libraries(xrdmqinjection PRIVATE XrdMqClient-Static) -target_link_libraries(xrdmqclientmaster PRIVATE XrdMqClient-Static) -target_link_libraries(xrdmqclientworker PRIVATE XrdMqClient-Static) -target_link_libraries(xrdmqsharedobjectclient PRIVATE XrdMqClient-Static) -target_link_libraries(xrdmqsharedobjectqueueclient PRIVATE XrdMqClient-Static) -target_link_libraries(xrdmqsharedobjectbroadcastclient PRIVATE XrdMqClient-Static) +if (NOT CLIENT) + add_executable(eos-shared-hash-test mq/SharedHashLoadTest.cc) + add_executable(xrdmqclienttest mq/XrdMqClientTest.cc) + add_executable(eos-mq-dumper mq/XrdMqQueueDumper.cc) + add_executable(eos-mq-feeder mq/XrdMqQueueFeeder.cc) + add_executable(xrdmqinjection mq/XrdMqQueueInjection.cc) + add_executable(xrdmqclientmaster mq/XrdMqClientMaster.cc) + add_executable(xrdmqclientworker mq/XrdMqClientWorker.cc) + add_executable(xrdmqsharedobjectclient mq/XrdMqSharedObjectClient.cc) + add_executable(xrdmqsharedobjectqueueclient mq/XrdMqSharedObjectQueueClient.cc) + add_executable(xrdmqsharedobjectbroadcastclient mq/XrdMqSharedObjectBroadCastClient.cc) + target_link_libraries(eos-shared-hash-test PRIVATE XrdMqClient-Static qclient) + target_link_libraries(xrdmqclienttest PRIVATE XrdMqClient-Static) + target_link_libraries(eos-mq-dumper PRIVATE XrdMqClient-Static) + target_link_libraries(eos-mq-feeder PRIVATE XrdMqClient-Static) + target_link_libraries(xrdmqinjection PRIVATE XrdMqClient-Static) + target_link_libraries(xrdmqclientmaster PRIVATE XrdMqClient-Static) + target_link_libraries(xrdmqclientworker PRIVATE XrdMqClient-Static) + target_link_libraries(xrdmqsharedobjectclient PRIVATE XrdMqClient-Static) + target_link_libraries(xrdmqsharedobjectqueueclient PRIVATE XrdMqClient-Static) + target_link_libraries(xrdmqsharedobjectbroadcastclient PRIVATE XrdMqClient-Static) + + install(TARGETS eos-mq-feeder eos-mq-dumper eos-shared-hash-test + RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}) +endif() install(TARGETS xrdstress.exe xrdcpabort xrdcprandom xrdcppgread xrdcpextend xrdcpshrink xrdcpappend xrdcpappendoverlap xrdcptruncate @@ -173,9 +178,6 @@ install(TARGETS xrdstress.exe xrdcpabort xrdcprandom xrdcppgread eos-udp-dumper eos-mmap eos-io-tool RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_SBINDIR}) -install(TARGETS eos-mq-feeder eos-mq-dumper eos-shared-hash-test - RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}) - install(PROGRAMS xrdstress eos-instance-test eos-instance-test-ci fuse/eos-fuse-test eos-rain-test eoscp-rain-test eos-io-test eos-accounting-test eos-oc-test eos-drain-test eos-groupdrain-test eos-mq-tests