[Cmake-commits] CMake branch, next, updated. v2.8.9-910-gc4ed48e

[Rolf Eike Beer]

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  c4ed48e838da78d6d5a20342637ad7e231c17c52 (commit)
       via  cc9d4cc12a616531678035873b186a54035d533e (commit)
      from  d7652627ce6151597fa4d91d659723feb69b6138 (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=c4ed48e838da78d6d5a20342637ad7e231c17c52
commit c4ed48e838da78d6d5a20342637ad7e231c17c52
Merge: d765262 cc9d4cc
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Sep 30 15:38:59 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 30 15:38:59 2012 -0400

    Merge topic 'test-ctest-memcheck' into next
    
    cc9d4cc fix regular expressions


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc9d4cc12a616531678035873b186a54035d533e
commit cc9d4cc12a616531678035873b186a54035d533e
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Sep 30 21:38:11 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Sep 30 21:38:11 2012 +0200

    fix regular expressions
    
    Depending on how stderr and stdout are mixed the results were not matched.

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 118ccf8..5e1b7b7 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -38,14 +38,14 @@ set_tests_properties(CTestTestMemcheckDummyValgrind CTestTestMemcheckDummyValgri
 
 set_tests_properties(CTestTestMemcheckDummyValgrindFailPre
     PROPERTIES
-    PASS_REGULAR_EXPRESSION "\nProblem running command: ${CMAKE_CURRENT_BINARY_DIR}[^\n]*fail[^\n]*\nProblem executing pre-memcheck command\\(s\\\).\nError in read script: ${CMAKE_CURRENT_BINARY_DIR}/DummyValgrindFailPre/test.cmake\n$")
+    PASS_REGULAR_EXPRESSION "\nProblem running command: ${CMAKE_CURRENT_BINARY_DIR}[^\n]*fail[^\n]*\n(.*\n)?Problem executing pre-memcheck command\\(s\\\).\n(.*\n)?Error in read script: ${CMAKE_CURRENT_BINARY_DIR}/DummyValgrindFailPre/test.cmake\n$")
 
 set_tests_properties(CTestTestMemcheckDummyValgrindFailPost
     PROPERTIES
-    PASS_REGULAR_EXPRESSION "\nProblem running command: ${CMAKE_CURRENT_BINARY_DIR}[^\n]*fail[^\n]*\nProblem executing post-memcheck command\\(s\\\).\nError in read script: ${CMAKE_CURRENT_BINARY_DIR}/DummyValgrindFailPost/test.cmake\n$")
+    PASS_REGULAR_EXPRESSION "\nProblem running command: ${CMAKE_CURRENT_BINARY_DIR}[^\n]*fail[^\n]*\n(.*\n)?Problem executing post-memcheck command\\(s\\\).\n(.*\n)?Error in read script: ${CMAKE_CURRENT_BINARY_DIR}/DummyValgrindFailPost/test.cmake\n$")
 
 set_tests_properties(CTestTestMemcheckDummyPurify PROPERTIES
-    PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: ${CMAKE_CURRENT_BINARY_DIR}/DummyPurify/Testing/Temporary/MemoryChecker.log\n.*\n-- Processing memory checking output: \nMemory checking results:\nError in read script: ${CMAKE_CURRENT_BINARY_DIR}/DummyPurify/test.cmake\n$")
+    PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: ${CMAKE_CURRENT_BINARY_DIR}/DummyPurify/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error in read script: ${CMAKE_CURRENT_BINARY_DIR}/DummyPurify/test.cmake\n$")
 
 set_tests_properties(CTestTestMemcheckDummyBC PROPERTIES
-    PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: ${CMAKE_CURRENT_BINARY_DIR}/DummyBC/Testing/Temporary/MemoryChecker.log\n.*\n-- Processing memory checking output: \nMemory checking results:\nError in read script: ${CMAKE_CURRENT_BINARY_DIR}/DummyBC/test.cmake\n$")
+    PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: ${CMAKE_CURRENT_BINARY_DIR}/DummyBC/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error parsing XML in stream at line 1: no element found\n(.*\n)?Error in read script: ${CMAKE_CURRENT_BINARY_DIR}/DummyBC/test.cmake\n$")

-----------------------------------------------------------------------

Summary of changes:
 Tests/CTestTestMemcheck/CMakeLists.txt |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake