[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4206-gcfe7047

[Brad King]

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  cfe70476103a493243e1ed63177a5620eba9c82d (commit)
       via  49533303a5dd46b5eea04947849e1a31e859fb83 (commit)
      from  453bd992617f5c4b926918c760d471aa2215b930 (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=cfe70476103a493243e1ed63177a5620eba9c82d
commit cfe70476103a493243e1ed63177a5620eba9c82d
Merge: 453bd99 4953330
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 16 10:12:53 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 16 10:12:53 2013 -0400

    Merge topic 'RunCMake-ignore-valgrind-lines' into next
    
    4953330 Tests/RunCMake: Tolerate valgrind lines in CMake output


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49533303a5dd46b5eea04947849e1a31e859fb83
commit 49533303a5dd46b5eea04947849e1a31e859fb83
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 16 09:59:52 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 16 09:59:52 2013 -0400

    Tests/RunCMake: Tolerate valgrind lines in CMake output
    
    When RunCMake tests run during dynamic analysis, valgrind may add lines
    of the form "==[0-9]+==..." to the output.  Remove such lines from the
    actual output before matching it against the expected output.

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 00faa4c..f770c93 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -52,6 +52,7 @@ function(run_cmake test)
     set(msg "${msg}Result is [${actual_result}], not [${expect_result}].\n")
   endif()
   foreach(o out err)
+    string(REGEX REPLACE "(^|\n)(==[0-9]+==[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}")
     string(REGEX REPLACE "\n+$" "" actual_std${o} "${actual_std${o}}")
     set(expect_${o} "")
     if(DEFINED expect_std${o})

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

Summary of changes:
 Tests/RunCMake/RunCMake.cmake |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake