diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-29 13:21:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-29 13:22:05 (GMT) |
| commit | 543394af283105a45a0fcd8e698749334d69dfe0 (patch) | |
| tree | be6bd5c31543e31e39ae809862421e3f9683dd77 | |
| parent | 9b4a5b4120ce1b11815ade9486c8269ccdf7c8df (diff) | |
| parent | 63177678d063fb0051541054d7657fb0c3177ea0 (diff) | |
| download | CMake-543394af283105a45a0fcd8e698749334d69dfe0.zip CMake-543394af283105a45a0fcd8e698749334d69dfe0.tar.gz CMake-543394af283105a45a0fcd8e698749334d69dfe0.tar.bz2 | |
Merge topic 'tests-tolerate-NINJA_STATUS' into release-3.21
63177678d0 Tests/RunCMake/Ninja.*: Sanitize NINJA_STATUS since we expect default behavior
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6271
| -rw-r--r-- | Tests/RunCMake/Ninja/RunCMakeTest.cmake | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Tests/RunCMake/Ninja/RunCMakeTest.cmake b/Tests/RunCMake/Ninja/RunCMakeTest.cmake index 8c91b34..3f239b9 100644 --- a/Tests/RunCMake/Ninja/RunCMakeTest.cmake +++ b/Tests/RunCMake/Ninja/RunCMakeTest.cmake @@ -18,6 +18,9 @@ else() message(FATAL_ERROR "'ninja --version' reported:\n${ninja_out}") endif() +# Sanitize NINJA_STATUS since we expect default behavior. +unset(ENV{NINJA_STATUS}) + if(CMAKE_HOST_WIN32) run_cmake(SelectCompilerWindows) else() diff --git a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake index e7acbc2..559c8f7 100644 --- a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake +++ b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake @@ -5,6 +5,9 @@ include(RunCMake) set(RunCMake_GENERATOR "Ninja Multi-Config") set(RunCMake_GENERATOR_IS_MULTI_CONFIG 1) +# Sanitize NINJA_STATUS since we expect default behavior. +unset(ENV{NINJA_STATUS}) + function(check_files dir) cmake_parse_arguments(_check_files "" "" "INCLUDE;EXCLUDE" ${ARGN}) |