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 37e53989fc45ec2f99bc987332c013bc910d6fb4 (commit)
via 0437cdd7f55c6db8df6192810be69a7b6da33206 (commit)
via 2f903094f2ef23648b188c32e6af6a74d2210b5e (commit)
via 4587e6413313372e2b79e5dcade31d31fdd99caa (commit)
via 1c3cb358eb55f4f79ca1c643e06c0f8d0f88131c (commit)
via a1060e121ff3ffb6d6b3a0507e4ae95bcb8a198e (commit)
via 73f154f9c60569bbdd8099dd258196dec16e50a1 (commit)
via faebec04a26a9cf9593edd5a18211d589e476d11 (commit)
via 03a77924ce27480e0590a1fd18c3f0d85f21eeaf (commit)
from 67e9bacb4351e7526808d055348fbc5a85269f32 (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=37e53989fc45ec2f99bc987332c013bc910d6fb4
commit 37e53989fc45ec2f99bc987332c013bc910d6fb4
Merge: 67e9bac 0437cdd
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 20 09:46:24 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Feb 20 09:46:24 2015 -0500
Merge topic 'ctest-output-options' into next
0437cdd7 Tests: Drop unnecessary stderr matching from
RunCMake.ctest_memcheck
2f903094 Tests: Teach RunCMake to tolerate 'Error kstat returned' lines in
test output
4587e641 Tests: Teach RunCMake to tolerate Guard Malloc lines in test output
1c3cb358 Tests: Teach RunCMake to tolerate BullseyeCoverage lines in test
output
a1060e12 Tests: Match curl error in RunCMake.ctest_submit FailDrop-http*
cases
73f154f9 Tests/RunCMake/ctest_submit: Match more error message combinations
faebec04 Tests/RunCMake/ctest_start: Drop unnecessary stderr expectation
file
03a77924 Revert "don't check stderr for ctest_*(QUIET) tests"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0437cdd7f55c6db8df6192810be69a7b6da33206
commit 0437cdd7f55c6db8df6192810be69a7b6da33206
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 20 09:16:41 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Feb 20 09:42:07 2015 -0500
Tests: Drop unnecessary stderr matching from RunCMake.ctest_memcheck
The Dummy*-stderr.txt files were needed only to match platform-specific
memcheck tooling output and verify that stderr is otherwise empty. Now
that the RunCMake infrastructure knows how to strip such lines before
matching, we can simply drop these files and use the default empty
string match.
diff --git a/Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt
b/Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt
deleted file mode 100644
index 14bc228..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^((^|
-)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
-]*)*$
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt
b/Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt
deleted file mode 100644
index 14bc228..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^((^|
-)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
-]*)*$
diff --git
a/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt
b/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt
deleted file mode 100644
index 14bc228..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^((^|
-)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
-]*)*$
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt
b/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt
deleted file mode 100644
index 14bc228..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^((^|
-)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
-]*)*$
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt
b/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt
deleted file mode 100644
index 14bc228..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^((^|
-)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
-]*)*$
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f903094f2ef23648b188c32e6af6a74d2210b5e
commit 2f903094f2ef23648b188c32e6af6a74d2210b5e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 20 09:12:47 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Feb 20 09:42:07 2015 -0500
Tests: Teach RunCMake to tolerate 'Error kstat returned' lines in test
output
When RunCMake tests run on Solaris, the output may contain unexpected
lines of the form "Error kstat returned...". These lines are printed by
SystemInformationImplementation::RunProcess when called from
SystemInformationImplementation::ParseValueFromKStat (see issue #12066).
Until someone investigates why kstat returns values outside the range it
documents, simply 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 873eb30..e47417e 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -83,7 +83,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:)[^\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]*\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=4587e6413313372e2b79e5dcade31d31fdd99caa
commit 4587e6413313372e2b79e5dcade31d31fdd99caa
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 20 09:05:22 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Feb 20 09:42:07 2015 -0500
Tests: Teach RunCMake to tolerate Guard Malloc lines in test output
When RunCMake tests run under Xcode Guard Malloc, Guard Malloc may add
lines of the form "<tool>(<pid>) malloc:..." 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 ffa1e2b..873eb30 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -83,7 +83,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)[^\n]*\n)+"
"\\1" actual_std${o} "${actual_std${o}}")
+ string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\([0-9]+\)
malloc:)[^\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=1c3cb358eb55f4f79ca1c643e06c0f8d0f88131c
commit 1c3cb358eb55f4f79ca1c643e06c0f8d0f88131c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 20 09:02:21 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Feb 20 09:42:07 2015 -0500
Tests: Teach RunCMake to tolerate BullseyeCoverage lines in test output
When RunCMake tests run under dynamic analysis, Bullseye may add lines
of the form "BullseyeCoverage..." 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 6389ef4..ffa1e2b 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -83,7 +83,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]+==[^\n]*\n)+" "\\1" actual_std${o}
"${actual_std${o}}")
+ string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage)[^\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=a1060e121ff3ffb6d6b3a0507e4ae95bcb8a198e
commit a1060e121ff3ffb6d6b3a0507e4ae95bcb8a198e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 20 08:54:45 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Feb 20 09:42:06 2015 -0500
Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases
Port the regex over from the CTestTestFailedSubmit-http[s] tests.
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
index c1a9126..9a32d9e 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
@@ -1,3 +1,3 @@
-Error message was: .*
+Error message was: [Cc]ould *n.t resolve host '?-no-site-'?
Problems when submitting via HTTP
Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-http/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
index 11db01a..0f49c04 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
@@ -1,3 +1,3 @@
-Error message was: .*
+Error message was: ([Cc]ould *n.t resolve host '?-no-site-'?|Protocol "https"
not supported or disabled in .*|.* was built with SSL disabled.*)
Problems when submitting via HTTP
Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-https/test.cmake
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73f154f9c60569bbdd8099dd258196dec16e50a1
commit 73f154f9c60569bbdd8099dd258196dec16e50a1
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 20 08:53:23 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Feb 20 08:53:23 2015 -0500
Tests/RunCMake/ctest_submit: Match more error message combinations
diff --git a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
index 34891a1..182bd10 100644
--- a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
@@ -1,4 +1,4 @@
*Error when uploading file: .*/Configure.xml
- *Error message was: Couldn't resolve host '-no-site-'
+ *Error message was: [Cc]ould *n.t resolve host '?-no-site-'?
*Problems when submitting via HTTP
*Error in read script:
.*/Tests/RunCMake/ctest_submit/CDashSubmitQuiet/test.cmake
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=faebec04a26a9cf9593edd5a18211d589e476d11
commit faebec04a26a9cf9593edd5a18211d589e476d11
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 20 08:46:25 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Feb 20 08:46:25 2015 -0500
Tests/RunCMake/ctest_start: Drop unnecessary stderr expectation file
The RunCMake infrastructure defaults to "^$" for stderr.
diff --git a/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
b/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03a77924ce27480e0590a1fd18c3f0d85f21eeaf
commit 03a77924ce27480e0590a1fd18c3f0d85f21eeaf
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 20 08:44:04 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Feb 20 08:44:04 2015 -0500
Revert "don't check stderr for ctest_*(QUIET) tests"
This reverts commit 73ff7bf44c042a9da9b5f3ec987131febf97d609.
We really want to check both. The test failures due to output
on stderr on some platforms need to be addressed directly.
diff --git a/Tests/RunCMake/ctest_build/BuildQuiet-stderr.txt
b/Tests/RunCMake/ctest_build/BuildQuiet-stderr.txt
deleted file mode 100644
index 8d98f9d..0000000
--- a/Tests/RunCMake/ctest_build/BuildQuiet-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-.*
diff --git a/Tests/RunCMake/ctest_configure/ConfigureQuiet-stderr.txt
b/Tests/RunCMake/ctest_configure/ConfigureQuiet-stderr.txt
deleted file mode 100644
index 8d98f9d..0000000
--- a/Tests/RunCMake/ctest_configure/ConfigureQuiet-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-.*
diff --git a/Tests/RunCMake/ctest_coverage/CoverageQuiet-stderr.txt
b/Tests/RunCMake/ctest_coverage/CoverageQuiet-stderr.txt
deleted file mode 100644
index 8d98f9d..0000000
--- a/Tests/RunCMake/ctest_coverage/CoverageQuiet-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-.*
diff --git a/Tests/RunCMake/ctest_memcheck/DummyQuiet-stderr.txt
b/Tests/RunCMake/ctest_memcheck/DummyQuiet-stderr.txt
deleted file mode 100644
index 8d98f9d..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyQuiet-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-.*
diff --git a/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
b/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
index 8d98f9d..10f3293 100644
--- a/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
+++ b/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
@@ -1 +1 @@
-.*
+^$
diff --git a/Tests/RunCMake/ctest_test/TestQuiet-stderr.txt
b/Tests/RunCMake/ctest_test/TestQuiet-stderr.txt
deleted file mode 100644
index 8d98f9d..0000000
--- a/Tests/RunCMake/ctest_test/TestQuiet-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-.*
diff --git a/Tests/RunCMake/ctest_upload/UploadQuiet-stderr.txt
b/Tests/RunCMake/ctest_upload/UploadQuiet-stderr.txt
deleted file mode 100644
index 8d98f9d..0000000
--- a/Tests/RunCMake/ctest_upload/UploadQuiet-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-.*
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/RunCMake.cmake | 2 +-
Tests/RunCMake/ctest_build/BuildQuiet-stderr.txt | 1 -
Tests/RunCMake/ctest_configure/ConfigureQuiet-stderr.txt | 1 -
Tests/RunCMake/ctest_coverage/CoverageQuiet-stderr.txt | 1 -
Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt | 3 ---
Tests/RunCMake/ctest_memcheck/DummyQuiet-stderr.txt | 1 -
Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt | 3 ---
.../RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt | 3 ---
Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt | 3 ---
Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt | 3 ---
Tests/RunCMake/ctest_start/StartQuiet-stderr.txt | 1 -
Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt | 2 +-
Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt | 2 +-
Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt | 2 +-
Tests/RunCMake/ctest_test/TestQuiet-stderr.txt | 1 -
Tests/RunCMake/ctest_upload/UploadQuiet-stderr.txt | 1 -
16 files changed, 4 insertions(+), 26 deletions(-)
delete mode 100644 Tests/RunCMake/ctest_build/BuildQuiet-stderr.txt
delete mode 100644 Tests/RunCMake/ctest_configure/ConfigureQuiet-stderr.txt
delete mode 100644 Tests/RunCMake/ctest_coverage/CoverageQuiet-stderr.txt
delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt
delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyQuiet-stderr.txt
delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt
delete mode 100644
Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt
delete mode 100644
Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt
delete mode 100644
Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt
delete mode 100644 Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
delete mode 100644 Tests/RunCMake/ctest_test/TestQuiet-stderr.txt
delete mode 100644 Tests/RunCMake/ctest_upload/UploadQuiet-stderr.txt
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
