diff --git a/cmake_modules/TokuSetupCTest.cmake b/cmake_modules/TokuSetupCTest.cmake index 536e764c4fbcb90971675142c12fc0fea9555341..c8184c715e35a968715450933c341876e0800812 100644 --- a/cmake_modules/TokuSetupCTest.cmake +++ b/cmake_modules/TokuSetupCTest.cmake @@ -81,7 +81,7 @@ set(BUILDNAME "${branchname} ${buildname_build_type} ${CMAKE_SYSTEM} ${machine_t include(CTest) -if (BUILD_TESTING OR BUILD_FT_TESTS) +if (BUILD_TESTING OR BUILD_FT_TESTS OR BUILD_SRC_TESTS) ## set up full valgrind suppressions file (concatenate the suppressions files) file(READ ft/valgrind.suppressions valgrind_suppressions) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/valgrind.suppressions" "${valgrind_suppressions}") @@ -130,4 +130,4 @@ if (BUILD_TESTING OR BUILD_FT_TESTS) option(RUN_PERF_TESTS "If set, run the perf tests." OFF) configure_file(CTestCustom.cmake . @ONLY) -endif (BUILD_TESTING OR BUILD_FT_TESTS) +endif (BUILD_TESTING OR BUILD_FT_TESTS OR BUILD_SRC_TESTS) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 020433d0cda0f66c3e77cb7c64dfb0c44ed4b8f9..a75399ad1a5db29c6c646614acf86a031745097b 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -1,6 +1,6 @@ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE DONT_DEPRECATE_ERRNO) -if(BUILD_TESTING) +if(BUILD_TESTING OR BUILD_SRC_TESTS) file(GLOB transparent_upgrade_srcs RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" upgrade*.cc) file(GLOB tdb_dontrun_srcs RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" bdb-simple-deadlock*.cc) @@ -707,4 +707,4 @@ if(BUILD_TESTING) ) endif (BDB_FOUND) set_tests_properties(${phenomenally_long_tests} PROPERTIES TIMEOUT 14400) -endif(BUILD_TESTING) +endif(BUILD_TESTING OR BUILD_SRC_TESTS)