diff options
author | David Tellenbach <david.tellenbach@me.com> | 2021-04-01 00:08:37 +0000 |
---|---|---|
committer | David Tellenbach <david.tellenbach@me.com> | 2021-04-01 00:08:37 +0000 |
commit | e4233b6e3d378b57bfccda8e60f95cfc42f7856e (patch) | |
tree | 40d9963e074cdf5f6d39628345c67ede23d2b88c /cmake | |
parent | ae95b74af96dd88e1efc5a521cbe779f48dbbb4d (diff) |
Add CI infrastructure for pre-merge smoke tests.
This patch adds pre-merge smoke tests for x86 Linux using gcc-10 and clang-10.
Closes #2188.
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/EigenTesting.cmake | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake index 5011340dc..0808446d6 100644 --- a/cmake/EigenTesting.cmake +++ b/cmake/EigenTesting.cmake @@ -716,13 +716,16 @@ macro(ei_split_testsuite num_splits) endforeach() endmacro(ei_split_testsuite num_splits) -# Defines two custom commands buildsmoketests and smoketests that build and run -# a number of tests specified in smoke_test_list. +# Defines the custom command buildsmoketests to build a number of tests +# specified in smoke_test_list. # # Test in smoke_test_list can be either test targets (e.g. packetmath) or # subtests targets (e.g. packetmath_2). If any of the test are not available # in the current configuration they are just skipped. # +# All tests added via this macro are labeled with the smoketest label. This +# allows running smoketests only using ctest. +# # Smoke tests are intended to be run before the whole test suite is invoked, # e.g., to smoke test patches. macro(ei_add_smoke_tests smoke_test_list) @@ -730,9 +733,6 @@ macro(ei_add_smoke_tests smoke_test_list) set(buildtarget "buildsmoketests") add_custom_target("${buildtarget}") - # We build a regex that matches our smoketests only and will pass it to ctest - set(ctest_regex "") - # Get list of all tests and translate it into a CMake list get_property(EIGEN_TESTS_LIST GLOBAL PROPERTY EIGEN_TESTS_LIST) string(REGEX REPLACE "\n" " " EIGEN_TESTS_LIST "${EIGEN_TESTS_LIST}") @@ -762,16 +762,9 @@ macro(ei_add_smoke_tests smoke_test_list) # is currently available, i.e., is in EIGEN_SUBTESTS_LIST if ("${test}" IN_LIST EIGEN_SUBTESTS_LIST) add_dependencies("${buildtarget}" "${test}") - # In the case of a subtest we match exactly - set(ctest_regex "${ctest_regex}^${test}$$|") + # Add label smoketest to be able to run smoketests using ctest + get_property(test_labels TEST ${test} PROPERTY LABELS) + set_property(TEST ${test} PROPERTY LABELS "${test_labels};smoketest") endif() endforeach() - - # Remove trailing '|' in ctest regex - string(REGEX REPLACE "\\|$" "" ctest_regex "${ctest_regex}") - message(STATUS "${ctest_regex}") - # Set the test target to run smoketests - set(testtarget "smoketests") - add_custom_target("${testtarget}" COMMAND ctest -R '${ctest_regex}' --random-shuffle) - add_dependencies("${testtarget}" "${buildtarget}") endmacro(ei_add_smoke_tests)
\ No newline at end of file |