mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-06 22:30:07 -05:00
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
This commit is contained in:
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user