diff options
author | Ralf Habacker <ralf.habacker@freenet.de> | 2024-01-17 21:51:30 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2024-01-31 13:33:15 (GMT) |
commit | f875c479f5b00198d813a56212b6410ee2a33b14 (patch) | |
tree | 1566abc79a1c213aed2f3783950dddb1839d121b /Tests/RunCMake/CMakeLists.txt | |
parent | 622a498477403a18b7abf3e50124cbf62c5bb6ca (diff) | |
download | CMake-f875c479f5b00198d813a56212b6410ee2a33b14.zip CMake-f875c479f5b00198d813a56212b6410ee2a33b14.tar.gz CMake-f875c479f5b00198d813a56212b6410ee2a33b14.tar.bz2 |
GoogleTest: Honor TEST_LAUNCHER in gtest_discover_tests
We run test executables to discover tests. Use the same launchers that
are used to run the tests. We already handle `CROSSCOMPILING_EMULATOR`.
Update the logic to account for the `TEST_LAUNCHER` property added by
commit 1ec0372ed4 (add_test: Optionally use a launcher for tests running
in-project targets, 2023-11-11), and for the `CROSSCOMPILING_EMULATOR`
behavior change in commit ca5a300d7f (add_test: Honor
CROSSCOMPILING_EMULATOR only when cross-compiling, 2023-11-02).
Fixes: #25603
Co-authored-by: Brad King <brad.king@kitware.com>
Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
Diffstat (limited to 'Tests/RunCMake/CMakeLists.txt')
-rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index f1baf92..f984c09 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -425,7 +425,11 @@ endif() add_RunCMake_test(GeneratorToolset) add_RunCMake_test(GetPrerequisites -DSAMPLE_EXE=$<TARGET_FILE:exit_code>) add_RunCMake_test(GNUInstallDirs -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME}) -add_RunCMake_test(GoogleTest) # Note: does not actually depend on Google Test +add_RunCMake_test(GoogleTest # Note: does not actually depend on Google Test + -DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID} + -DCMAKE_C_COMPILER_VERSION=${CMAKE_C_COMPILER_VERSION} + -DCMAKE_VS_PLATFORM_NAME=${CMAKE_VS_PLATFORM_NAME} + ) add_RunCMake_test(Graphviz) add_RunCMake_test(Languages) add_RunCMake_test(LinkItemValidation) |