[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1204-g4a06460

Brad King brad.king at kitware.com
Wed Dec 17 09:44:12 EST 2014 

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  4a06460d9878b869037bda40dcec1fd7515e0942 (commit)
       via  947464f337201fffcfd205c0f0ef39c1d2d00dde (commit)
      from  2177c44cdbced14775ba1525c90f5d322b83dee4 (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=4a06460d9878b869037bda40dcec1fd7515e0942
commit 4a06460d9878b869037bda40dcec1fd7515e0942
Merge: 2177c44 947464f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 17 09:44:11 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 17 09:44:11 2014 -0500

    Merge topic 'test-memcheck-with-RunCMake' into next
    
    947464f3 Tests: Fix RunCMake.CTestMemcheck matching of guard malloc lines


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=947464f337201fffcfd205c0f0ef39c1d2d00dde
commit 947464f337201fffcfd205c0f0ef39c1d2d00dde
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 17 09:41:17 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 17 09:41:17 2014 -0500

    Tests: Fix RunCMake.CTestMemcheck matching of guard malloc lines
    
    They appear in stderr, not stdout, and '\n' cannot be used to encode
    a newline in the expectation file regex syntax.

diff --git a/Tests/RunCMake/CTestMemcheck/DummyBC-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyBC-stdout.txt
index 360bec5..5829613 100644
--- a/Tests/RunCMake/CTestMemcheck/DummyBC-stdout.txt
+++ b/Tests/RunCMake/CTestMemcheck/DummyBC-stdout.txt
@@ -1,3 +1,3 @@
 1/1 MemCheck #1: RunCMake \.+   Passed +[0-9]+.[0-9]+ sec
-(ctest\([0-9]+\) malloc: [^\n]*\n)*
+
 100% tests passed, 0 tests failed out of 1
diff --git a/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stdout.txt
index 360bec5..5829613 100644
--- a/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stdout.txt
+++ b/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stdout.txt
@@ -1,3 +1,3 @@
 1/1 MemCheck #1: RunCMake \.+   Passed +[0-9]+.[0-9]+ sec
-(ctest\([0-9]+\) malloc: [^\n]*\n)*
+
 100% tests passed, 0 tests failed out of 1
diff --git a/Tests/RunCMake/CTestMemcheck/DummyPurify-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyPurify-stderr.txt
index 10f3293..14bc228 100644
--- a/Tests/RunCMake/CTestMemcheck/DummyPurify-stderr.txt
+++ b/Tests/RunCMake/CTestMemcheck/DummyPurify-stderr.txt
@@ -1 +1,3 @@
-^$
+^((^|
+)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
+]*)*$
diff --git a/Tests/RunCMake/CTestMemcheck/DummyPurify-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyPurify-stdout.txt
index ccd0acc..dabb004 100644
--- a/Tests/RunCMake/CTestMemcheck/DummyPurify-stdout.txt
+++ b/Tests/RunCMake/CTestMemcheck/DummyPurify-stdout.txt
@@ -1,6 +1,6 @@
 1/1 MemCheck #1: RunCMake \.+   Passed +[0-9]+.[0-9]+ sec
-(ctest\([0-9]+\) malloc: [^\n]*\n)*
+
 100% tests passed, 0 tests failed out of 1
 .*
 -- Processing memory checking output:( )
-(ctest\([0-9]+\) malloc: [^\n]*\n)*Memory checking results:
+Memory checking results:
diff --git a/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stdout.txt
index 360bec5..5829613 100644
--- a/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stdout.txt
+++ b/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stdout.txt
@@ -1,3 +1,3 @@
 1/1 MemCheck #1: RunCMake \.+   Passed +[0-9]+.[0-9]+ sec
-(ctest\([0-9]+\) malloc: [^\n]*\n)*
+
 100% tests passed, 0 tests failed out of 1
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrind-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrind-stderr.txt
index 10f3293..14bc228 100644
--- a/Tests/RunCMake/CTestMemcheck/DummyValgrind-stderr.txt
+++ b/Tests/RunCMake/CTestMemcheck/DummyValgrind-stderr.txt
@@ -1 +1,3 @@
-^$
+^((^|
+)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
+]*)*$
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrind-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrind-stdout.txt
index ccd0acc..dabb004 100644
--- a/Tests/RunCMake/CTestMemcheck/DummyValgrind-stdout.txt
+++ b/Tests/RunCMake/CTestMemcheck/DummyValgrind-stdout.txt
@@ -1,6 +1,6 @@
 1/1 MemCheck #1: RunCMake \.+   Passed +[0-9]+.[0-9]+ sec
-(ctest\([0-9]+\) malloc: [^\n]*\n)*
+
 100% tests passed, 0 tests failed out of 1
 .*
 -- Processing memory checking output:( )
-(ctest\([0-9]+\) malloc: [^\n]*\n)*Memory checking results:
+Memory checking results:
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stdout.txt
index ccd0acc..dabb004 100644
--- a/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stdout.txt
+++ b/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stdout.txt
@@ -1,6 +1,6 @@
 1/1 MemCheck #1: RunCMake \.+   Passed +[0-9]+.[0-9]+ sec
-(ctest\([0-9]+\) malloc: [^\n]*\n)*
+
 100% tests passed, 0 tests failed out of 1
 .*
 -- Processing memory checking output:( )
-(ctest\([0-9]+\) malloc: [^\n]*\n)*Memory checking results:
+Memory checking results:
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stdout.txt
index ccd0acc..dabb004 100644
--- a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stdout.txt
+++ b/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stdout.txt
@@ -1,6 +1,6 @@
 1/1 MemCheck #1: RunCMake \.+   Passed +[0-9]+.[0-9]+ sec
-(ctest\([0-9]+\) malloc: [^\n]*\n)*
+
 100% tests passed, 0 tests failed out of 1
 .*
 -- Processing memory checking output:( )
-(ctest\([0-9]+\) malloc: [^\n]*\n)*Memory checking results:
+Memory checking results:
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stderr.txt
index 10f3293..14bc228 100644
--- a/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stderr.txt
+++ b/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stderr.txt
@@ -1 +1,3 @@
-^$
+^((^|
+)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
+]*)*$
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stdout.txt
index 0eedce8..5a5675c 100644
--- a/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stdout.txt
+++ b/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stdout.txt
@@ -1,7 +1,7 @@
 2/2 Test #2: RunCMakeAgain .*
 1/1 MemCheck #1: RunCMake \.+   Passed +[0-9]+.[0-9]+ sec
-(ctest\([0-9]+\) malloc: [^\n]*\n)*
+
 100% tests passed, 0 tests failed out of 1
 .*
 -- Processing memory checking output:( )
-(ctest\([0-9]+\) malloc: [^\n]*\n)*Memory checking results:
+Memory checking results:
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stdout.txt
index 360bec5..5829613 100644
--- a/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stdout.txt
+++ b/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stdout.txt
@@ -1,3 +1,3 @@
 1/1 MemCheck #1: RunCMake \.+   Passed +[0-9]+.[0-9]+ sec
-(ctest\([0-9]+\) malloc: [^\n]*\n)*
+
 100% tests passed, 0 tests failed out of 1
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stderr.txt
index 10f3293..14bc228 100644
--- a/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stderr.txt
+++ b/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stderr.txt
@@ -1 +1,3 @@
-^$
+^((^|
+)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
+]*)*$
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stdout.txt
index ccd0acc..dabb004 100644
--- a/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stdout.txt
+++ b/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stdout.txt
@@ -1,6 +1,6 @@
 1/1 MemCheck #1: RunCMake \.+   Passed +[0-9]+.[0-9]+ sec
-(ctest\([0-9]+\) malloc: [^\n]*\n)*
+
 100% tests passed, 0 tests failed out of 1
 .*
 -- Processing memory checking output:( )
-(ctest\([0-9]+\) malloc: [^\n]*\n)*Memory checking results:
+Memory checking results:
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stderr.txt
index 10f3293..14bc228 100644
--- a/Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stderr.txt
+++ b/Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stderr.txt
@@ -1 +1,3 @@
-^$
+^((^|
+)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
+]*)*$

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

Summary of changes:
 Tests/RunCMake/CTestMemcheck/DummyBC-stdout.txt                    |    2 +-
 Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stdout.txt           |    2 +-
 Tests/RunCMake/CTestMemcheck/DummyPurify-stderr.txt                |    4 +++-
 Tests/RunCMake/CTestMemcheck/DummyPurify-stdout.txt                |    4 ++--
 Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stdout.txt       |    2 +-
 Tests/RunCMake/CTestMemcheck/DummyValgrind-stderr.txt              |    4 +++-
 Tests/RunCMake/CTestMemcheck/DummyValgrind-stdout.txt              |    4 ++--
 Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stdout.txt |    4 ++--
 Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stdout.txt      |    4 ++--
 .../RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stderr.txt  |    4 +++-
 .../RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stdout.txt  |    4 ++--
 Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stdout.txt     |    2 +-
 Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stderr.txt       |    4 +++-
 Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stdout.txt       |    4 ++--
 Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stderr.txt    |    4 +++-
 15 files changed, 31 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
CMake

More information about the Cmake-commits mailing list