diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-28 17:55:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-28 17:55:57 (GMT) |
| commit | f0673c1022afdc9f9d91ea460efc6790b7aa6289 (patch) | |
| tree | 68c8aba886d4d4969f22cefafa8a07839bfb9691 | |
| parent | 9de73d7ee51073841e0aea83096c187ea365532e (diff) | |
| parent | bf24b6c501f1f8c9146153038bb202ae246de7d0 (diff) | |
| download | CMake-f0673c1022afdc9f9d91ea460efc6790b7aa6289.zip CMake-f0673c1022afdc9f9d91ea460efc6790b7aa6289.tar.gz CMake-f0673c1022afdc9f9d91ea460efc6790b7aa6289.tar.bz2 | |
Merge topic 'deterministic-CTest-tests'
bf24b6c5 Tests: Guard more CTest tests against parallel execution.
| -rw-r--r-- | Tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 0557035..32beffa 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2415,6 +2415,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release set_tests_properties(CTestCoverageCollectGCOV PROPERTIES PASS_REGULAR_EXPRESSION "PASSED with correct output.*Testing/CoverageInfo/main.cpp.gcov") + set_property(TEST CTestCoverageCollectGCOV PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=) configure_file( "${CMake_SOURCE_DIR}/Tests/CTestTestEmptyBinaryDirectory/test.cmake.in" @@ -2714,6 +2715,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release ) set_tests_properties(CTestTestSkipReturnCode PROPERTIES PASS_REGULAR_EXPRESSION "CMakeV1 \\.* +Passed.*CMakeV2 \\.+\\*+Skipped") + set_property(TEST CTestTestSkipReturnCode PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=) ADD_TEST_MACRO(CTestTestSerialInDepends ${CMAKE_CTEST_COMMAND} -j 4 --output-on-failure -C "\${CTestTest_CONFIG}") diff --git a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake index 6c96a26..5ad6511 100644 --- a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake +++ b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake @@ -4,6 +4,8 @@ set(SITE test-site) set(BUILDNAME test-build) set(COVERAGE_COMMAND "") +unset(ENV{CTEST_PARALLEL_LEVEL}) + function(run_mc_test CASE_NAME CHECKER_COMMAND) run_ctest(${CASE_NAME} ${ARGN}) endfunction() |