[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-571-g4f657d8

Brad King brad.king at kitware.com
Sat Feb 21 06:49:00 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  4f657d84432683d288da022c1f13f70ec93e6591 (commit)
       via  193ffd64b5bbefcb7345e1911b2512029995b3d5 (commit)
      from  972251f54c7c3aa652cff7262783ab2660b52a43 (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=4f657d84432683d288da022c1f13f70ec93e6591
commit 4f657d84432683d288da022c1f13f70ec93e6591
Merge: 972251f 193ffd6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Feb 21 06:48:58 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 21 06:48:58 2015 -0500

    Merge topic 'ctest-output-options' into next
    
    193ffd64 fixup! Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=193ffd64b5bbefcb7345e1911b2512029995b3d5
commit 193ffd64b5bbefcb7345e1911b2512029995b3d5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Feb 21 06:45:58 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Feb 21 06:46:08 2015 -0500

    fixup! Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases
    
    Match message for ftp too.

diff --git a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
index 73df5c1..4cd60ed 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: .*
+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

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

Summary of changes:
 Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list