[Cmake-commits] CMake branch, next, updated. v3.3.1-3016-g92313fa

[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  92313fa5d52220bd667ca0f9c290064940d3070a (commit)
       via  3b8fcf9bc2162af9f8e7bf12eb3c557d271366f9 (commit)
       via  de6e88f26acc2145ee839737a7a8d6fcc0e1f1cd (commit)
      from  87cc1f23f451f2f0c9ca6186d1c06f00438abaac (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=92313fa5d52220bd667ca0f9c290064940d3070a
commit 92313fa5d52220bd667ca0f9c290064940d3070a
Merge: 87cc1f2 3b8fcf9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 17 09:15:13 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 17 09:15:13 2015 -0400

    Merge topic 'test-RunCMake-exclude-more-output' into next
    
    3b8fcf9b Tests: Teach RunCMake to tolerate 'Bullseye Testing' lines in test output
    de6e88f2 Tests: Teach RunCMake to tolerate 'Time Machine' lines in test output


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b8fcf9bc2162af9f8e7bf12eb3c557d271366f9
commit 3b8fcf9bc2162af9f8e7bf12eb3c557d271366f9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 17 09:10:36 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 17 09:12:41 2015 -0400

    Tests: Teach RunCMake to tolerate 'Bullseye Testing' lines in test output
    
    When testing under Bullseye coverage, some tests get lines on stderr of
    the form:
    
     ... Bullseye Testing Technology ...
    
    Remove such lines from output before matching because they are not
    representative of the actual test output.

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index ffb3e50..e2ad503 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -102,7 +102,7 @@ function(run_cmake test)
   endif()
   foreach(o out err)
     string(REGEX REPLACE "\r\n" "\n" actual_std${o} "${actual_std${o}}")
-    string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:|Error kstat returned|[^\n]*from Time Machine by path)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}")
+    string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:|Error kstat returned|[^\n]*from Time Machine by path|[^\n]*Bullseye Testing Technology)[^\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})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de6e88f26acc2145ee839737a7a8d6fcc0e1f1cd
commit de6e88f26acc2145ee839737a7a8d6fcc0e1f1cd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 17 09:08:30 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 17 09:12:40 2015 -0400

    Tests: Teach RunCMake to tolerate 'Time Machine' lines in test output
    
    On some OS X machines some tests get lines on stderr of the form:
    
     ... attempting to exclude an item from Time Machine by path ...
    
    produced by the system.  Remove such lines from output before matching
    because they are not representative of the actual test output.

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 46bc494..ffb3e50 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -102,7 +102,7 @@ function(run_cmake test)
   endif()
   foreach(o out err)
     string(REGEX REPLACE "\r\n" "\n" actual_std${o} "${actual_std${o}}")
-    string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:|Error kstat returned)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}")
+    string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:|Error kstat returned|[^\n]*from Time Machine by path)[^\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 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake