echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'GoogleTest-variable-expansion'

Browse Source 
c7884ceefa GoogleTest: Restore support for spaces in explicit WORKING_DIRECTORY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10192
This commit is contained in:
Brad King 2025-01-28 13:42:11 +00:00 committed by Kitware Robot
commit 00471550de
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Modules/GoogleTest.cmake
View File

@ -400,9 +400,9 @@ function(gtest_add_tests)
message(FATAL_ERROR "${arg_TARGET} does not define an existing CMake target")
endif()
if(NOT arg_WORKING_DIRECTORY)
unset(workDir)
unset(maybe_WORKING_DIRECTORY)
else()
set(workDir WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}")
set(maybe_WORKING_DIRECTORY "WORKING_DIRECTORY \${arg_WORKING_DIRECTORY}")
endif()
if(NOT arg_SOURCES)
@ -492,11 +492,11 @@ function(gtest_add_tests)
${arg_TEST_PREFIX}${orig_test_name}${arg_TEST_SUFFIX}
)
cmake_language(EVAL CODE "
add_test(NAME ${ctest_test_name}
${workDir}
COMMAND ${arg_TARGET}
add_test(NAME \${ctest_test_name}
${maybe_WORKING_DIRECTORY}
COMMAND \${arg_TARGET}
--gtest_also_run_disabled_tests
--gtest_filter=${gtest_test_name}
--gtest_filter=\${gtest_test_name}
${extra_args}
__CMP0178 [==[${cmp0178}]==]
)"
@ -508,10 +508,10 @@ function(gtest_add_tests)
else()
set(ctest_test_name ${arg_TEST_PREFIX}${gtest_test_name}${arg_TEST_SUFFIX})
cmake_language(EVAL CODE "
add_test(NAME ${ctest_test_name}
${workDir}
COMMAND ${arg_TARGET}
--gtest_filter=${gtest_test_name}
add_test(NAME \${ctest_test_name}
${maybe_WORKING_DIRECTORY}
COMMAND \${arg_TARGET}
--gtest_filter=\${gtest_test_name}
${extra_args}
__CMP0178 [==[${cmp0178}]==]
)"

2
Tests/RunCMake/GoogleTest/Launcher.cmake
View File

@ -27,9 +27,11 @@ set_property(TARGET launcher_test PROPERTY CROSSCOMPILING_EMULATOR "${emulator}"
gtest_discover_tests(
launcher_test
EXTRA_ARGS a "" b
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
gtest_add_tests(
TARGET launcher_test
EXTRA_ARGS a "" b
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)