[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2914-ga2b6f56

[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  a2b6f569d3d611745baca4017cd3c08094007bd9 (commit)
       via  4ee4934289ceaff895a76ef0d1f760b8b8c3bd2b (commit)
       via  5d8a6d10f36a35a1318d391e8d16f96ae97a9740 (commit)
       via  18ae1ccfc8750defeb8b6501e3e139424ad55a4b (commit)
      from  c1589de3069d1a6dfb053f6270fdd0db90069cef (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=a2b6f569d3d611745baca4017cd3c08094007bd9
commit a2b6f569d3d611745baca4017cd3c08094007bd9
Merge: c1589de 4ee4934
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu May 9 05:56:34 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 9 05:56:34 2013 -0400

    Merge topic 'MemChecker-improvements' into next
    
    4ee4934 make another attempt to set the test configuration type
    5d8a6d1 fix another matching problem because of mixed stdout/stderr
    18ae1cc fix regex to match memcheck timing


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ee4934289ceaff895a76ef0d1f760b8b8c3bd2b
commit 4ee4934289ceaff895a76ef0d1f760b8b8c3bd2b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu May 9 11:55:31 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu May 9 11:55:31 2013 +0200

    make another attempt to set the test configuration type
    
    Other tests do the same, although I don't understand what's going on here.
    Let's see if it works ;)

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 9f3cbc5..43e0a84 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -49,7 +49,7 @@ function(gen_mc_test_internal NAME CHECKER)
     endforeach()
     add_test(NAME CTestTestMemcheck${NAME}
         COMMAND ${CMAKE_CTEST_COMMAND}
-        -C "${CTEST_CONFIGURATION_TYPE}"
+        -C \${CTEST_CONFIGURATION_TYPE}
         -S "${CMAKE_CURRENT_BINARY_DIR}/${NAME}/test.cmake" -V
         --output-log "${CMAKE_CURRENT_BINARY_DIR}/${NAME}/testOutput.log"
         ${ARGN}

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d8a6d10f36a35a1318d391e8d16f96ae97a9740
commit 5d8a6d10f36a35a1318d391e8d16f96ae97a9740
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu May 9 11:41:47 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu May 9 11:41:47 2013 +0200

    fix another matching problem because of mixed stdout/stderr

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 70768bd..9f3cbc5 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -73,7 +73,7 @@ function(gen_mcnl_test NAME CHECKER)
         )
     set_tests_properties(CTestTestMemcheck${NAME}
         PROPERTIES
-        PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: ${CMAKE_CURRENT_BINARY_DIR}/${NAME}/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error in read script: ${CMAKE_CURRENT_BINARY_DIR}/${NAME}/test.cmake\n${BULLSEYE_MSG}$")
+        PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: ${CMAKE_CURRENT_BINARY_DIR}/${NAME}/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error in read script: ${CMAKE_CURRENT_BINARY_DIR}/${NAME}/test.cmake\n")
 endfunction(gen_mcnl_test)
 
 unset(CTEST_EXTRA_CONFIG)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18ae1ccfc8750defeb8b6501e3e139424ad55a4b
commit 18ae1ccfc8750defeb8b6501e3e139424ad55a4b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu May 9 11:38:11 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu May 9 11:38:11 2013 +0200

    fix regex to match memcheck timing

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index a6813ee..70768bd 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -33,7 +33,7 @@ target_link_libraries(memcheck_fail CMakeLib)
 # same filenames.
 add_subdirectory(NoLogDummyChecker)
 
-set(NORMAL_CTEST_OUTPUT "\n1/1 MemCheck #1: RunCMake \\.+   Passed +[0-0]+.[0-9]+ sec\n\n100% tests passed, 0 tests failed out of 1\n.*\n-- Processing memory checking output: \nMemory checking results:\n")
+set(NORMAL_CTEST_OUTPUT "\n1/1 MemCheck #1: RunCMake \\.+   Passed +[0-9]+.[0-9]+ sec\n\n100% tests passed, 0 tests failed out of 1\n.*\n-- Processing memory checking output: \nMemory checking results:\n")
 set(BULLSEYE_MSG "(BullseyeCoverage[^\n]*\n)?")
 
 function(gen_mc_test_internal NAME CHECKER)

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

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


hooks/post-receive
-- 
CMake