[Cmake-commits] CMake branch, next, updated. v3.3.2-3074-g43e2f07
Brad King
brad.king at kitware.com
Fri Sep 18 11:32:01 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 43e2f07d76df5db597cb0d236074eb0b393a0d9f (commit)
via 44d49c09a1849e2db2d024d09b4bafa65caac5b7 (commit)
via 1fc22fa9416cc8fc787434645c77bad29ddee702 (commit)
from 7850cfecff44ecdf0f8cefcc5f0d15b68df2941f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43e2f07d76df5db597cb0d236074eb0b393a0d9f
commit 43e2f07d76df5db597cb0d236074eb0b393a0d9f
Merge: 7850cfe 44d49c0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 18 11:32:00 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 18 11:32:00 2015 -0400
Merge topic 'ctest-custom-output-size' into next
44d49c09 fixup! CTest: Add options to limit output of passed and failed tests
1fc22fa9 fixup! CTest: Document and test custom output size settings
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44d49c09a1849e2db2d024d09b4bafa65caac5b7
commit 44d49c09a1849e2db2d024d09b4bafa65caac5b7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 18 11:31:10 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 18 11:31:10 2015 -0400
fixup! CTest: Add options to limit output of passed and failed tests
diff --git a/Tests/RunCMake/CTestCommandLine/TestOutputSize-check.cmake b/Tests/RunCMake/CTestCommandLine/TestOutputSize-check.cmake
index 23fdc97..918d242 100644
--- a/Tests/RunCMake/CTestCommandLine/TestOutputSize-check.cmake
+++ b/Tests/RunCMake/CTestCommandLine/TestOutputSize-check.cmake
@@ -1,21 +1,16 @@
file(GLOB test_xml_file "${RunCMake_TEST_BINARY_DIR}/Testing/*/Test.xml")
if(test_xml_file)
file(READ "${test_xml_file}" test_xml LIMIT 4096)
- if("${test_xml}" MATCHES [[<Test Status="passed">([^<]|<[^/]|</[^T])*</Test>]])
- set(test_passed "${CMAKE_MATCH_0}")
- 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}")
- endif()
+ if("${test_xml}" MATCHES [[(<Test Status="passed">.*</Test>).*(<Test Status="failed">.*</Test>)]])
+ set(test_passed "${CMAKE_MATCH_1}")
+ set(test_failed "${CMAKE_MATCH_2}")
else()
- set(RunCMake_TEST_FAILED "Test.xml does not contain a passed test:\n ${test_xml}")
+ set(RunCMake_TEST_FAILED "Test.xml does not contain a passed then failed test:\n ${test_xml}")
endif()
- if("${test_xml}" MATCHES [[<Test Status="failed">([^<]|<[^/]|</[^T])*</Test>]])
- set(test_failed "${CMAKE_MATCH_0}")
- if(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 failed test:\n ${test_xml}")
+ 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")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1fc22fa9416cc8fc787434645c77bad29ddee702
commit 1fc22fa9416cc8fc787434645c77bad29ddee702
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 18 11:29:35 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 18 11:29:35 2015 -0400
fixup! CTest: Document and test custom output size settings
diff --git a/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake b/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake
index 23fdc97..918d242 100644
--- a/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake
+++ b/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake
@@ -1,21 +1,16 @@
file(GLOB test_xml_file "${RunCMake_TEST_BINARY_DIR}/Testing/*/Test.xml")
if(test_xml_file)
file(READ "${test_xml_file}" test_xml LIMIT 4096)
- if("${test_xml}" MATCHES [[<Test Status="passed">([^<]|<[^/]|</[^T])*</Test>]])
- set(test_passed "${CMAKE_MATCH_0}")
- 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}")
- endif()
+ if("${test_xml}" MATCHES [[(<Test Status="passed">.*</Test>).*(<Test Status="failed">.*</Test>)]])
+ set(test_passed "${CMAKE_MATCH_1}")
+ set(test_failed "${CMAKE_MATCH_2}")
else()
- set(RunCMake_TEST_FAILED "Test.xml does not contain a passed test:\n ${test_xml}")
+ set(RunCMake_TEST_FAILED "Test.xml does not contain a passed then failed test:\n ${test_xml}")
endif()
- if("${test_xml}" MATCHES [[<Test Status="failed">([^<]|<[^/]|</[^T])*</Test>]])
- set(test_failed "${CMAKE_MATCH_0}")
- if(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 failed test:\n ${test_xml}")
+ 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")
-----------------------------------------------------------------------
Summary of changes:
.../CTestCommandLine/TestOutputSize-check.cmake | 21 ++++++++------------
.../RunCMake/ctest_test/TestOutputSize-check.cmake | 21 ++++++++------------
2 files changed, 16 insertions(+), 26 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list