From 5f14040c34096c7421e9d8e5dc9aff1bbe21f8b0 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 27 Oct 2015 21:41:31 +0100 Subject: Tests: Don't overwrite RunCMake_TEST_FAILED variable --- Tests/RunCMake/ctest_test/TestOutputSize-check.cmake | 10 +++++----- 1 file 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 [[(.*).*(.*)]]) set(test_passed "${CMAKE_MATCH_1}") set(test_failed "${CMAKE_MATCH_2}") + if(NOT "${test_passed}" MATCHES [[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 [[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 [[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 [[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() -- cgit v0.12