[Cmake-commits] CMake branch, next, updated. v3.0.2-5463-g7dc3a62

[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  7dc3a625a0264949b24be8a81cc059e9a871f23d (commit)
       via  e0acdd1a47511ef7077c7945878bd447fbb475c2 (commit)
       via  93da76d4d8983ccbc6116a12fabe994361b5bfa3 (commit)
      from  741c1f0afed9145e6df91079f62b0dbc7238406f (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=7dc3a625a0264949b24be8a81cc059e9a871f23d
commit 7dc3a625a0264949b24be8a81cc059e9a871f23d
Merge: 741c1f0 e0acdd1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 26 09:22:22 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 26 09:22:22 2014 -0400

    Merge topic 'fix-test-FailedSubmit-match' into next
    
    e0acdd1a Tests: Adjust expected error message in FailedSubmit-ftp
    93da76d4 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0acdd1a47511ef7077c7945878bd447fbb475c2
commit e0acdd1a47511ef7077c7945878bd447fbb475c2
Author:     Tony Kelman <tony at kelman.net>
AuthorDate: Thu Sep 25 19:58:33 2014 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 26 08:34:14 2014 -0400

    Tests: Adjust expected error message in FailedSubmit-ftp
    
    Error message from cygwin's curl (using `--system-libs`) in
    CTestTestFailedSubmit-ftp was:
    
      Failed to connect to  port 21: Connection timed out
            ^^^
    
    Update our regex to match this.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 5b336ce..f27949a 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2609,7 +2609,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}|Failed *t*o* 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:
 Source/CMakeVersion.cmake |    2 +-
 Tests/CMakeLists.txt      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake