kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'deterministic-CTest-tests' 

bf24b6c5 Tests: Guard more CTest tests against parallel execution.
This commit is contained in:
Brad King 2015-04-28 13:55:57 -04:00 committed by CMake Topic Stage
parent 9de73d7ee5 bf24b6c501
commit f0673c1022
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/CMakeLists.txt
View File

@ -2415,6 +2415,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
set_tests_properties(CTestCoverageCollectGCOV PROPERTIES set_tests_properties(CTestCoverageCollectGCOV PROPERTIES
PASS_REGULAR_EXPRESSION PASS_REGULAR_EXPRESSION
"PASSED with correct output.*Testing/CoverageInfo/main.cpp.gcov") "PASSED with correct output.*Testing/CoverageInfo/main.cpp.gcov")
set_property(TEST CTestCoverageCollectGCOV PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=)
configure_file( configure_file(
"${CMake_SOURCE_DIR}/Tests/CTestTestEmptyBinaryDirectory/test.cmake.in" "${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 set_tests_properties(CTestTestSkipReturnCode PROPERTIES
PASS_REGULAR_EXPRESSION "CMakeV1 \\.* +Passed.*CMakeV2 \\.+\\*+Skipped") 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 ADD_TEST_MACRO(CTestTestSerialInDepends ${CMAKE_CTEST_COMMAND} -j 4
--output-on-failure -C "\${CTestTest_CONFIG}") --output-on-failure -C "\${CTestTest_CONFIG}")

2
Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
View File

@ -4,6 +4,8 @@ set(SITE test-site)
set(BUILDNAME test-build) set(BUILDNAME test-build)
set(COVERAGE_COMMAND "") set(COVERAGE_COMMAND "")
unset(ENV{CTEST_PARALLEL_LEVEL})
function(run_mc_test CASE_NAME CHECKER_COMMAND) function(run_mc_test CASE_NAME CHECKER_COMMAND)
run_ctest(${CASE_NAME} ${ARGN}) run_ctest(${CASE_NAME} ${ARGN})
endfunction() endfunction()