diff options
| author | Martin Hořeňovský | 2026-08-20 14:45:30 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2026-08-20 16:24:18 +0200 |
| commit | 8582805f548e3e091d8d35188f4c3a690f989b0f (patch) | |
| tree | a378b537da2dbcfce03e406a02193e3107426cf3 /extras | |
| parent | 0aeb818520028ca05cc2539ed242402ef7a7ae41 (diff) | |
| download | catch3-8582805f548e3e091d8d35188f4c3a690f989b0f.tar.gz | |
Support TEST_{PREFIX,SUFFIX} with leading/trailing whitespace
Closes #2149
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/Catch.cmake | 8 | ||||
| -rw-r--r-- | extras/CatchAddTests.cmake | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/extras/Catch.cmake b/extras/Catch.cmake index c143d330..14ddf228 100644 --- a/extras/Catch.cmake +++ b/extras/Catch.cmake @@ -231,8 +231,8 @@ function(catch_discover_tests TARGET) -D "TEST_SPEC=${_TEST_SPEC}" -D "TEST_EXTRA_ARGS=${_EXTRA_ARGS}" -D "TEST_PROPERTIES=${_PROPERTIES}" - -D "TEST_PREFIX=${_TEST_PREFIX}" - -D "TEST_SUFFIX=${_TEST_SUFFIX}" + -D "TEST_PREFIX='${_TEST_PREFIX}'" + -D "TEST_SUFFIX='${_TEST_SUFFIX}'" -D "TEST_LIST=${_TEST_LIST}" -D "TEST_REPORTER=${_REPORTER}" -D "TEST_OUTPUT_DIR=${_OUTPUT_DIR}" @@ -277,8 +277,8 @@ function(catch_discover_tests TARGET) " TEST_SPEC" " [==[" "${_TEST_SPEC}" "]==]" "\n" " TEST_EXTRA_ARGS" " [==[" "${_EXTRA_ARGS}" "]==]" "\n" " TEST_PROPERTIES" " [==[" "${_PROPERTIES}" "]==]" "\n" - " TEST_PREFIX" " [==[" "${_TEST_PREFIX}" "]==]" "\n" - " TEST_SUFFIX" " [==[" "${_TEST_SUFFIX}" "]==]" "\n" + " TEST_PREFIX" " [==['" "${_TEST_PREFIX}" "']==]" "\n" + " TEST_SUFFIX" " [==['" "${_TEST_SUFFIX}" "']==]" "\n" " TEST_LIST" " [==[" "${_TEST_LIST}" "]==]" "\n" " TEST_REPORTER" " [==[" "${_REPORTER}" "]==]" "\n" " TEST_OUTPUT_DIR" " [==[" "${_OUTPUT_DIR}" "]==]" "\n" diff --git a/extras/CatchAddTests.cmake b/extras/CatchAddTests.cmake index 38a57d36..f4840196 100644 --- a/extras/CatchAddTests.cmake +++ b/extras/CatchAddTests.cmake @@ -235,8 +235,10 @@ function(catch_discover_tests_impl) set(_WriteToFileThreshold 50000) set(add_tags "${_ADD_TAGS_AS_LABELS}") - set(prefix "${_TEST_PREFIX}") - set(suffix "${_TEST_SUFFIX}") + # TEST_{PREFIX,SUFFIX} is enclosed in single quotes to keep ensure + # leading/trailing whitespace isn't trimmed by CMake's argument passing. + string(REGEX REPLACE "^'(.*)'$" "\\1" prefix "${_TEST_PREFIX}") + string(REGEX REPLACE "^'(.*)'$" "\\1" suffix "${_TEST_SUFFIX}") set(spec ${_TEST_SPEC}) set(extra_args ${_TEST_EXTRA_ARGS}) set(properties ${_TEST_PROPERTIES}) |