[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-584-g235f381

[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  235f381ba46a49aca8f029b3e9a7c00fb564b19b (commit)
       via  895bf36e8173cd4822050dd351833a772d0e9510 (commit)
       via  23b74116b99c2a514bd3c353ef7a06df0bc20250 (commit)
      from  c9a0af8cdd549a27e1b8002c22209659edff2dc9 (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=235f381ba46a49aca8f029b3e9a7c00fb564b19b
commit 235f381ba46a49aca8f029b3e9a7c00fb564b19b
Merge: c9a0af8 895bf36
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Feb 22 07:07:57 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 22 07:07:57 2015 -0500

    Merge topic 'ctest-output-options' into next
    
    895bf36e fixup! Tests/RunCMake/ctest_submit: Match more error message combinations
    23b74116 fixup! Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=895bf36e8173cd4822050dd351833a772d0e9510
commit 895bf36e8173cd4822050dd351833a772d0e9510
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Feb 22 07:07:13 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Feb 22 07:07:13 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 182bd10..8496b68 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-'?
  *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=23b74116b99c2a514bd3c353ef7a06df0bc20250
commit 23b74116b99c2a514bd3c353ef7a06df0bc20250
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Feb 22 07:03:39 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Feb 22 07:03:39 2015 -0500

    fixup! Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases
    
    Match a ":" in the output.

diff --git a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
index 4cd60ed..c75b209 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-ftp-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-'?
    Problems when submitting via FTP
 Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-ftp/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
index 9a32d9e..64a21a1 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-'?
    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 0f49c04..59c88d9 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-'?|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-ftp-stderr.txt     |    2 +-
 Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt    |    2 +-
 Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake