[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-594-g7697f2d
Brad King
brad.king at kitware.com
Mon Feb 23 09:58:22 EST 2015
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 7697f2d205067cf5eb7b0b387314a621b8d896f4 (commit)
via 2a69dfe40ee03787e02cdba0fc0a785b13ed8eae (commit)
via 51bc77c9ebc3a4356f21e65965ce807222fb5eba (commit)
from 743fe7d75f43842bf9ba5ba15d30b2cb4b6d792a (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=7697f2d205067cf5eb7b0b387314a621b8d896f4
commit 7697f2d205067cf5eb7b0b387314a621b8d896f4
Merge: 743fe7d 2a69dfe
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 09:58:21 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 09:58:21 2015 -0500
Merge topic 'ctest-output-options' into next
2a69dfe4 fixup! Tests/RunCMake/ctest_submit: Match more error message combinations
51bc77c9 fixup! Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a69dfe40ee03787e02cdba0fc0a785b13ed8eae
commit 2a69dfe40ee03787e02cdba0fc0a785b13ed8eae
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 09:56:35 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 09:56:35 2015 -0500
fixup! 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 8496b68..ec0a869 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: [Cc]ould *n.t resolve host:? '?-no-site-'?
+ *Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
*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=51bc77c9ebc3a4356f21e65965ce807222fb5eba
commit 51bc77c9ebc3a4356f21e65965ce807222fb5eba
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 09:56:12 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 09:56:12 2015 -0500
fixup! Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
index 64a21a1..9895181 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: [Cc]ould *n.t resolve host:? '?-no-site-'?
+Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
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 59c88d9..a9c5d58 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: ([Cc]ould *n.t resolve host:? '?-no-site-'?|Protocol "https" not supported or disabled in .*|.* was built with SSL disabled.*)
+Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*|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
-----------------------------------------------------------------------
Summary of changes:
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 +-
3 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list