OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added: option to build test suite by default

Browse Source 
convenience, default behaviour is unchanged
This commit is contained in:
Arne Morten Kvarving 2018-01-24 14:39:59 +01:00
parent ed6657377a
commit 580d5074f4
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/Modules/IFEMOptions.cmake
View File

@ -15,5 +15,6 @@ OPTION(IFEM_USE_CEREAL "Compile with cereal support?" ON)
OPTION(IFEM_AS_SUBMODULE "Compile IFEM as a submodule of apps?" OFF)
OPTION(IFEM_WHOLE_PROG_OPTIM "Compile IFEM with link-time optimizations?" OFF)
OPTION(IFEM_TEST_MEMCHECK "Run tests through valgrind?" OFF)
OPTION(IFEM_BUILD_TESTING "Build testing by default?" OFF)
OPTION(IFEM_SERIAL_TESTS_IN_PARALLEL "Run serial tests in parallel builds?" ON)
OPTION(IFEM_INSTALL_DOXY "Install documentation?" ON)

12
cmake/Scripts/IFEMTesting.cmake
View File

@ -43,7 +43,7 @@ macro(IFEM_add_test_app path workdir name)
else()
set(TEST_SRCS ${path})
endif()
add_executable(${name}-test EXCLUDE_FROM_ALL ${IFEM_PATH}/src/IFEM-test.C ${TEST_SRCS})
add_executable(${name}-test ${EXCL_ALL} ${IFEM_PATH}/src/IFEM-test.C ${TEST_SRCS})
gtest_add_tests($<TARGET_FILE:${name}-test> ${workdir} TEST_SRCS)
list(APPEND TEST_APPS ${name}-test)
target_link_libraries(${name}-test ${ARGN} gtest pthread)
@ -87,7 +87,7 @@ macro(IFEM_add_unittests IFEM_PATH)
if(ISTL_FOUND)
list(APPEND TEST_SRCS_MPI ${IFEM_PATH}/src/LinAlg/Test/MPI/TestISTLMatrix.C)
endif()
add_executable(IFEM-MPI-test EXCLUDE_FROM_ALL
add_executable(IFEM-MPI-test ${EXCL_ALL}
${IFEM_PATH}/src/IFEM-test.C ${TEST_SRCS_MPI})
target_link_libraries(IFEM-MPI-test ${IFEM_LIBRARIES} ${IFEM_DEPLIBS} gtest)
gtest_add_tests($<TARGET_FILE:IFEM-MPI-test> ${IFEM_PATH} TEST_SRCS_MPI
@ -134,7 +134,7 @@ macro(add_check_target)
ifem_add_unittests(${IFEM_PATH})
endif()
if(NOT TARGET gtest)
add_subdirectory(${IFEM_PATH}/3rdparty/gtest gtest EXCLUDE_FROM_ALL)
add_subdirectory(${IFEM_PATH}/3rdparty/gtest gtest ${EXCL_ALL})
endif()
if (${UNIT_TEST_NUMBER} GREATER 0)
foreach(test_number RANGE 1 ${UNIT_TEST_NUMBER})
@ -212,3 +212,9 @@ endif()
configure_file(${IFEM_REGTEST_SCRIPT} regtest.sh)
configure_file(${IFEM_CLANG_CHECK_TEST_SCRIPT} clang-check-test.sh)
configure_file(${IFEM_CPPCHECK_TEST_SCRIPT} cppcheck-test.sh)
if(IFEM_BUILD_TESTING)
set(EXCL_ALL)
else()
set(EXCL_ALL EXCLUDE_FROM_ALL)
endif()