[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2925-ga2dbbac
Rolf Eike Beer
eike at sf-mail.de
Thu May 9 13:05:08 EDT 2013
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 a2dbbacfc5e67882f31fdfad543895ebadbef578 (commit)
via 00f1e50801c65c2aae8612d0ea7af83baa339005 (commit)
from 7b31979b07e99d1e535bbc72a0bcec4a55b50b65 (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=a2dbbacfc5e67882f31fdfad543895ebadbef578
commit a2dbbacfc5e67882f31fdfad543895ebadbef578
Merge: 7b31979 00f1e50
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu May 9 13:05:07 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 9 13:05:07 2013 -0400
Merge topic 'MemChecker-improvements' into next
00f1e50 fix another timing regex
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00f1e50801c65c2aae8612d0ea7af83baa339005
commit 00f1e50801c65c2aae8612d0ea7af83baa339005
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu May 9 19:04:42 2013 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu May 9 19:04:42 2013 +0200
fix another timing regex
diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index fab1c2e..1c0c3b2 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -143,7 +143,7 @@ set_tests_properties(CTestTestMemcheckDummyValgrindIgnoreMemcheck
PASS_REGULAR_EXPRESSION "\n2/2 Test #2: RunCMakeAgain .*${NORMAL_CTEST_OUTPUT}${BULLSEYE_MSG}$")
set_tests_properties(CTestTestMemcheckDummyBC PROPERTIES
- PASS_REGULAR_EXPRESSION "\n1/1 MemCheck #1: RunCMake \\.+ Passed +[0-0]+.[0-9]+ sec\n\n100% tests passed, 0 tests failed out of 1\n(.*\n)?Error parsing XML in stream at line 1: no element found\n")
+ PASS_REGULAR_EXPRESSION "\n1/1 MemCheck #1: RunCMake \\.+ Passed +[0-9]+.[0-9]+ sec\n\n100% tests passed, 0 tests failed out of 1\n(.*\n)?Error parsing XML in stream at line 1: no element found\n")
set_tests_properties(CTestTestMemcheckDummyValgrindInvalidSupFile PROPERTIES
PASS_REGULAR_EXPRESSION "\nCannot find memory checker suppression file: ${CMAKE_CURRENT_BINARY_DIR}/does-not-exist\n")
-----------------------------------------------------------------------
Summary of changes:
Tests/CTestTestMemcheck/CMakeLists.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list