thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-10 01:25:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove ctest

Browse Source
This commit is contained in:
Alexey Milovidov 2023-11-16 23:32:17 +01:00
parent 482d8ca9d8
commit 1abcb28624
4 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -561,7 +561,6 @@ option(CHECK_LARGE_OBJECT_SIZES "Check that there are no large object files afte
add_subdirectory (base) add_subdirectory (base)
add_subdirectory (src) add_subdirectory (src)
add_subdirectory (programs) add_subdirectory (programs)
add_subdirectory (tests)
add_subdirectory (utils) add_subdirectory (utils)
if (FUZZER) if (FUZZER)

19
cmake/add_check.cmake
View File

@ -1,19 +0,0 @@
# Adding test output on failure
enable_testing ()
if (NOT TARGET check)
if (CMAKE_CONFIGURATION_TYPES)
add_custom_target (check COMMAND ${CMAKE_CTEST_COMMAND}
--force-new-ctest-process --output-on-failure --build-config "$<CONFIGURATION>"
WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
else ()
add_custom_target (check COMMAND ${CMAKE_CTEST_COMMAND}
--force-new-ctest-process --output-on-failure
WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
endif ()
endif ()
macro (add_check target)
add_test (NAME test_${target} COMMAND ${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
add_dependencies (check ${target})
endmacro (add_check)

4
src/CMakeLists.txt
View File

@ -600,8 +600,6 @@ if (TARGET ch_rust::skim)
dbms_target_link_libraries(PUBLIC ch_rust::skim) dbms_target_link_libraries(PUBLIC ch_rust::skim)
endif() endif()
include ("${ClickHouse_SOURCE_DIR}/cmake/add_check.cmake")
if (ENABLE_TESTS) if (ENABLE_TESTS)
macro (grep_gtest_sources BASE_DIR DST_VAR) macro (grep_gtest_sources BASE_DIR DST_VAR)
# Cold match files that are not in tests/ directories # Cold match files that are not in tests/ directories
@ -645,6 +643,4 @@ if (ENABLE_TESTS)
if (TARGET ch_contrib::parquet) if (TARGET ch_contrib::parquet)
target_link_libraries(unit_tests_dbms PRIVATE ch_contrib::parquet) target_link_libraries(unit_tests_dbms PRIVATE ch_contrib::parquet)
endif() endif()
add_check(unit_tests_dbms)
endif () endif ()

26
tests/CMakeLists.txt
View File

@ -1,26 +0,0 @@
enable_testing()
# Run tests with "ninja check" or "make check"
if (TARGET check)
message (STATUS "Target check already exists")
else ()
include (${ClickHouse_SOURCE_DIR}/cmake/add_check.cmake)
endif ()
option (ENABLE_CLICKHOUSE_TEST "Install clickhouse-test script and relevant tests scenarios" OFF)
if (ENABLE_CLICKHOUSE_TEST)
install (PROGRAMS clickhouse-test DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
install (
DIRECTORY queries performance config
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/clickhouse-test
USE_SOURCE_PERMISSIONS
COMPONENT clickhouse
PATTERN "CMakeLists.txt" EXCLUDE
PATTERN ".gitignore" EXCLUDE
)
endif ()
if (ENABLE_TEST_INTEGRATION)
add_subdirectory (integration)
endif ()