From f45c88d38c4c5630a528d2d380ff1f2df2343bec Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Mon, 4 Aug 2025 02:47:39 +0300 Subject: [PATCH] Move test & build_test to top-level cmakelists --- CMakeLists.txt | 12 +++++++++++- src/CMakeLists.txt | 12 ------------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1aeb2d52..86a568b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,5 +6,15 @@ set(VITASTOR_VERSION "2.4.3") include(CTest) -add_subdirectory(src) +add_custom_target(build_tests) +add_custom_target(test + COMMAND + echo leak:tcmalloc > ${CMAKE_CURRENT_BINARY_DIR}/lsan-suppress.txt && + env LSAN_OPTIONS=suppressions=${CMAKE_CURRENT_BINARY_DIR}/lsan-suppress.txt ${CMAKE_CTEST_COMMAND} +) +# make -j16 -C ../../build test_heap && ../../build/src/test/test_heap +# make -j16 -C ../../build test_heap && rm -f $(find ../../build -name '*.gcda') && ctest -V -T test -T coverage -R heap --test-dir ../../build && (cd ../../build; gcovr -f ../src --html --html-nested -o coverage/index.html; cd ../src/test) +# make -j16 -C ../../build test_blockstore && rm -f $(find ../../build -name '*.gcda') && ctest -V -T test -T coverage -R blockstore --test-dir ../../build && (cd ../../build; gcovr -f ../src --html --html-nested -o coverage/index.html; cd ../src/test) +# kcov --include-path=../../../src ../../kcov ./test_blockstore add_dependencies(test build_tests) +add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 42e3265f..a290fec8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -84,18 +84,6 @@ else() set(LIBURING_LIBRARIES uring) endif (${WITH_SYSTEM_LIBURING}) -add_custom_target(build_tests) -add_custom_target(test - COMMAND - echo leak:tcmalloc > ${CMAKE_CURRENT_BINARY_DIR}/lsan-suppress.txt && - env LSAN_OPTIONS=suppressions=${CMAKE_CURRENT_BINARY_DIR}/lsan-suppress.txt ${CMAKE_CTEST_COMMAND} -) -# make -j16 -C ../../build test_heap && ../../build/src/test/test_heap -# make -j16 -C ../../build test_heap && rm -f $(find ../../build -name '*.gcda') && ctest -V -T test -T coverage -R heap --test-dir ../../build && (cd ../../build; gcovr -f ../src --html --html-nested -o coverage/index.html; cd ../src/test) -# make -j16 -C ../../build test_blockstore && rm -f $(find ../../build -name '*.gcda') && ctest -V -T test -T coverage -R blockstore --test-dir ../../build && (cd ../../build; gcovr -f ../src --html --html-nested -o coverage/index.html; cd ../src/test) -# kcov --include-path=../../../src ../../kcov ./test_blockstore -add_dependencies(test build_tests) - include_directories( ../ ${CMAKE_SOURCE_DIR}/src/blockstore