diff options
| author | Brad King <brad.king@kitware.com> | 2024-07-04 14:05:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-07-04 14:05:27 (GMT) |
| commit | 0a22c97e06607cbda329e524700065272066bef9 (patch) | |
| tree | 7bc0c6332dd82eae9d44ab21f7db77403d6e01c2 | |
| parent | a63bee680ce050e41f549ad9e3a811700347a3f6 (diff) | |
| parent | fe8dc3012eca70ed1ecc1774466c7eb5bee6e8c1 (diff) | |
| download | CMake-0a22c97e06607cbda329e524700065272066bef9.zip CMake-0a22c97e06607cbda329e524700065272066bef9.tar.gz CMake-0a22c97e06607cbda329e524700065272066bef9.tar.bz2 | |
Merge topic 'test-ExternalProject'
fe8dc3012e Tests: Fix RunCMake.ExternalProject when git is not available
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Christoph Grüninger <foss@grueninger.de>
Merge-request: !9639
| -rw-r--r-- | Tests/RunCMake/ExternalProject/RunCMakeTest.cmake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake b/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake index 3c7cd68..98e3996 100644 --- a/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake +++ b/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake @@ -15,9 +15,6 @@ endif() run_cmake(BadIndependentStep1) run_cmake(BadIndependentStep2) -run_cmake(TLSVersionBadArg) -run_cmake(TLSVersionBadVar) -run_cmake(TLSVersionBadEnv) run_cmake(NoOptions) run_cmake(SourceEmpty) run_cmake(SourceMissing) @@ -256,5 +253,9 @@ if(GIT_EXECUTABLE) # on some platforms. It may go to stdout or stderr, so force it to be merged. set(RunCMake_TEST_OUTPUT_MERGE TRUE) run_cmake(FetchGitRefs) - set(RunCMake_TEST_OUTPUT_MERGE FALSE) + unset(RunCMake_TEST_OUTPUT_MERGE) + + run_cmake(TLSVersionBadArg) + run_cmake(TLSVersionBadVar) + run_cmake(TLSVersionBadEnv) endif() |