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

Merge topic 'fix-ctest_test-parallel-execution'

Browse Source 
6a56c824 Tests: Disable parallel test execution while running ctest_test
5f14040c Tests: Don't overwrite RunCMake_TEST_FAILED variable
This commit is contained in:
Brad King 2015-10-28 08:48:02 -04:00 committed by CMake Topic Stage
commit 27570a6d0e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tests/RunCMake/ctest_test/RunCMakeTest.cmake
View File

@ -71,6 +71,7 @@ add_test(NAME PassingTest COMMAND ${CMAKE_COMMAND} -E echo PassingTestOutput)
add_test(NAME FailingTest COMMAND ${CMAKE_COMMAND} -E no_such_command) add_test(NAME FailingTest COMMAND ${CMAKE_COMMAND} -E no_such_command)
]]) ]])
unset(ENV{CTEST_PARALLEL_LEVEL})
run_ctest(TestOutputSize) run_ctest(TestOutputSize)
endfunction() endfunction()
run_TestOutputSize() run_TestOutputSize()

6
Tests/RunCMake/ctest_test/TestOutputSize-check.cmake
View File

@ -4,14 +4,14 @@ if(test_xml_file)
if("${test_xml}" MATCHES [[(<Test Status="passed">.*</Test>).*(<Test Status="failed">.*</Test>)]]) if("${test_xml}" MATCHES [[(<Test Status="passed">.*</Test>).*(<Test Status="failed">.*</Test>)]])
set(test_passed "${CMAKE_MATCH_1}") set(test_passed "${CMAKE_MATCH_1}")
set(test_failed "${CMAKE_MATCH_2}") set(test_failed "${CMAKE_MATCH_2}")
else()
set(RunCMake_TEST_FAILED "Test.xml does not contain a passed then failed test:\n ${test_xml}")
endif()
if(NOT "${test_passed}" MATCHES [[<Value>PassingTes\.\.\..*10 bytes]]) if(NOT "${test_passed}" MATCHES [[<Value>PassingTes\.\.\..*10 bytes]])
set(RunCMake_TEST_FAILED "Test.xml passed test output not truncated at 10 bytes:\n ${test_passed}") set(RunCMake_TEST_FAILED "Test.xml passed test output not truncated at 10 bytes:\n ${test_passed}")
elseif(NOT "${test_failed}" MATCHES [[<Value>CMake Error:\.\.\..*12 bytes]]) elseif(NOT "${test_failed}" MATCHES [[<Value>CMake Error:\.\.\..*12 bytes]])
set(RunCMake_TEST_FAILED "Test.xml failed test output not truncated at 12 bytes:\n ${test_failed}") set(RunCMake_TEST_FAILED "Test.xml failed test output not truncated at 12 bytes:\n ${test_failed}")
endif() endif()
else()
set(RunCMake_TEST_FAILED "Test.xml does not contain a passed then failed test:\n ${test_xml}")
endif()
else() else()
set(RunCMake_TEST_FAILED "Test.xml not found") set(RunCMake_TEST_FAILED "Test.xml not found")
endif() endif()