diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-28 12:48:02 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-28 12:48:02 (GMT) |
| commit | 27570a6d0ea6df41a7792ce2c3ba2f0c9e1916df (patch) | |
| tree | 4a7211457a97a72da092b54ab42a488ac27cc171 | |
| parent | d3325c3db79e7decff881cc8113d6febb6fd136b (diff) | |
| parent | 6a56c8247fa874bd418c3e175c941070dafb0e76 (diff) | |
| download | CMake-27570a6d0ea6df41a7792ce2c3ba2f0c9e1916df.zip CMake-27570a6d0ea6df41a7792ce2c3ba2f0c9e1916df.tar.gz CMake-27570a6d0ea6df41a7792ce2c3ba2f0c9e1916df.tar.bz2 | |
Merge topic 'fix-ctest_test-parallel-execution'
6a56c824 Tests: Disable parallel test execution while running ctest_test
5f14040c Tests: Don't overwrite RunCMake_TEST_FAILED variable
| -rw-r--r-- | Tests/RunCMake/ctest_test/RunCMakeTest.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/ctest_test/TestOutputSize-check.cmake | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake index e2f380c..1b31726 100644 --- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake +++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake @@ -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) ]]) + unset(ENV{CTEST_PARALLEL_LEVEL}) run_ctest(TestOutputSize) endfunction() run_TestOutputSize() diff --git a/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake b/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake index 918d242..74ad669 100644 --- a/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake +++ b/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake @@ -4,14 +4,14 @@ if(test_xml_file) if("${test_xml}" MATCHES [[(<Test Status="passed">.*</Test>).*(<Test Status="failed">.*</Test>)]]) set(test_passed "${CMAKE_MATCH_1}") set(test_failed "${CMAKE_MATCH_2}") + 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}") + 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}") + endif() 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]]) - 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]]) - set(RunCMake_TEST_FAILED "Test.xml failed test output not truncated at 12 bytes:\n ${test_failed}") - endif() else() set(RunCMake_TEST_FAILED "Test.xml not found") endif() |