[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1831-gf0766f0

[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  f0766f00f03d58217e7046a7861206a3114a9fa7 (commit)
       via  63d864a02664d1a2cbd201b327ced1345d62d14a (commit)
      from  6569fd2027d78dd798087a191c5375bd70eb813c (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=f0766f00f03d58217e7046a7861206a3114a9fa7
commit f0766f00f03d58217e7046a7861206a3114a9fa7
Merge: 6569fd2 63d864a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 3 16:50:07 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 3 16:50:07 2014 -0400

    Merge topic 'fix-CTestTestFailedSubmit-ftp-for-osx-system-curl' into next
    
    63d864a0 Tests: Fix CTestTestFailedSubmit-ftp with OS X system libcurl


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63d864a02664d1a2cbd201b327ced1345d62d14a
commit 63d864a02664d1a2cbd201b327ced1345d62d14a
Author:     Alex Ciobanu <alex at rogue-research.com>
AuthorDate: Thu Apr 3 16:26:41 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 3 16:48:37 2014 -0400

    Tests: Fix CTestTestFailedSubmit-ftp with OS X system libcurl
    
    On OS X 10.9 the system libcurl has a different error message when
    failing to connect:
    
      Failed connect to :21; Connection refused
    
    Match this message to pass the test.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1c474ab..0e60ed1 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2440,6 +2440,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   set(regex "${regex}|Error message was: ")
   set(regex "${regex}([Cc]ould *n.t resolve host")
   set(regex "${regex}|[Cc]ould *n.t connect to host")
+  set(regex "${regex}|Failed connect to")
   set(regex "${regex}|Empty reply from server")
   set(regex "${regex}|The requested URL returned error")
   set(regex "${regex}|libcurl was built with SSL disabled. https: not supported)")

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

Summary of changes:
 Tests/CMakeLists.txt |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake