diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-10 13:46:07 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-10 13:46:14 (GMT) |
| commit | 6c737b273a7474ff20ffff06071f414dad9777c5 (patch) | |
| tree | 4498b2d18dccac22fd334460e76350c4ad2f4202 /Modules | |
| parent | e61e9cec6d604bea99b0556dae5eba58285e3c1f (diff) | |
| parent | 89a843d6ea35a2d0704a5fbc13858e5b84546744 (diff) | |
| download | CMake-6c737b273a7474ff20ffff06071f414dad9777c5.zip CMake-6c737b273a7474ff20ffff06071f414dad9777c5.tar.gz CMake-6c737b273a7474ff20ffff06071f414dad9777c5.tar.bz2 | |
Merge topic 'googletest-skipped'
89a843d6ea GoogleTest: Add testcase for skipped tests
98868dad1c GoogleTest: Add support for skipped tests
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4586
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/GoogleTestAddTests.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/GoogleTestAddTests.cmake b/Modules/GoogleTestAddTests.cmake index 65af4c2..499332f 100644 --- a/Modules/GoogleTestAddTests.cmake +++ b/Modules/GoogleTestAddTests.cmake @@ -134,6 +134,7 @@ function(gtest_discover_tests_impl) "${prefix}${pretty_suite}.${pretty_test}${suffix}" PROPERTIES WORKING_DIRECTORY "${_TEST_WORKING_DIR}" + SKIP_REGULAR_EXPRESSION "\\\\[ SKIPPED \\\\]" ${properties} ) list(APPEND tests_buffer "${prefix}${pretty_suite}.${pretty_test}${suffix}") |