[Cmake-commits] CMake branch, next, updated. v3.1.0-2244-g661541c

[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  661541c4d9e363c1785299e359588a82b97d16f5 (commit)
       via  6f4b103b56e280a162ca544a43f47abb3bf3f1ce (commit)
      from  1f8c14286538290277c81761e7109479d6e563c2 (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=661541c4d9e363c1785299e359588a82b97d16f5
commit 661541c4d9e363c1785299e359588a82b97d16f5
Merge: 1f8c142 6f4b103
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 20 10:27:38 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 20 10:27:38 2015 -0500

    Merge topic 'test-ctest_submit-fail-with-RunCMake' into next
    
    6f4b103b Tests: Fix RunCMake.CTestSubmit 'drop' cases


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f4b103b56e280a162ca544a43f47abb3bf3f1ce
commit 6f4b103b56e280a162ca544a43f47abb3bf3f1ce
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 20 10:11:39 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 20 10:11:39 2015 -0500

    Tests: Fix RunCMake.CTestSubmit 'drop' cases
    
    When curl is given a URL of the form '<something>://' it tries to
    resolve '<something>' as a host name.  If the host happens to exist and
    have a server then the drop might actually appear to work.  Instead use
    an explicit '-no-site-' host to ensure it cannot connect.
    
    Reported-by: Gilles Khouzam <Gilles.Khouzam at microsoft.com>

diff --git a/Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in b/Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in
index f0e1653..378a85a 100644
--- a/Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in
+++ b/Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in
@@ -3,3 +3,4 @@ set(CTEST_PROJECT_NAME "CTestSubmit at CASE_NAME@")
 # Intentionally leave out other upload-related CTestConfig.cmake settings
 # so that any ctest_submit calls fail with an error message.
 set(CTEST_DROP_METHOD "@CASE_DROP_METHOD@")
+set(CTEST_DROP_SITE "@CASE_DROP_SITE@")
diff --git a/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake b/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake
index 7cab3f3..3638007 100644
--- a/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake
@@ -2,6 +2,7 @@ include(RunCMake)
 
 # Default case parameters.
 set(CASE_DROP_METHOD "http")
+set(CASE_DROP_SITE "-no-site-")
 set(CASE_CTEST_SUBMIT_ARGS "")
 
 function(run_ctest CASE_NAME)

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

Summary of changes:
 Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in |    1 +
 Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake   |    1 +
 2 files changed, 2 insertions(+)


hooks/post-receive
-- 
CMake