summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-04-30 14:32:15 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-04-30 14:32:15 (GMT)
commit88c5ec72b07914e96af9a97c23a5701adc8739cf (patch)
tree3f5b141129c73d3088d4eca7b78f31aa58049733 /Tests
parent088d27c38bf8d6c5e016d0632943551142f5326b (diff)
parent703e76252930429ac39d3ebf456e3e1e688d1982 (diff)
downloadCMake-88c5ec72b07914e96af9a97c23a5701adc8739cf.zip
CMake-88c5ec72b07914e96af9a97c23a5701adc8739cf.tar.gz
CMake-88c5ec72b07914e96af9a97c23a5701adc8739cf.tar.bz2
Merge topic 'test-RunCMake-parallel-make'
703e7625 Tests: Protect RunCMake tests from MAKEFLAGS in environment (#15542)
Diffstat (limited to 'Tests')
-rw-r--r--Tests/RunCMake/RunCMake.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index b24ae0b..70c0d6c 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -135,3 +135,6 @@ function(run_cmake_command test)
set(RunCMake_TEST_COMMAND "${ARGN}")
run_cmake(${test})
endfunction()
+
+# Protect RunCMake tests from calling environment.
+unset(ENV{MAKEFLAGS})