diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-27 20:41:31 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-27 20:42:24 (GMT) |
| commit | 5f14040c34096c7421e9d8e5dc9aff1bbe21f8b0 (patch) | |
| tree | ec59371559df96019cbe4092d749c7deaf67e8d0 /Tests/RunCMake/ctest_test | |
| parent | 8c13f0f7eaff8fd0404dbbc9a6eab5ee2637643b (diff) | |
| download | CMake-5f14040c34096c7421e9d8e5dc9aff1bbe21f8b0.zip CMake-5f14040c34096c7421e9d8e5dc9aff1bbe21f8b0.tar.gz CMake-5f14040c34096c7421e9d8e5dc9aff1bbe21f8b0.tar.bz2 | |
Tests: Don't overwrite RunCMake_TEST_FAILED variable
Diffstat (limited to 'Tests/RunCMake/ctest_test')
| -rw-r--r-- | Tests/RunCMake/ctest_test/TestOutputSize-check.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
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() |