[Cmake-commits] CMake branch, next, updated. v3.1.0-2293-gc2650e5

[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  c2650e5588c8ce19ffbc3f861ce19f033c2eede3 (commit)
       via  ef97cd8587e7f8d4017b18147aaaca0ec5cb9f0c (commit)
      from  c709ebb08e675fc4603187cd8a125a6b8f704436 (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=c2650e5588c8ce19ffbc3f861ce19f033c2eede3
commit c2650e5588c8ce19ffbc3f861ce19f033c2eede3
Merge: c709ebb ef97cd8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 21 16:36:04 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 21 16:36:04 2015 -0500

    Merge topic 'test-ctest_submit-fail-with-RunCMake' into next
    
    ef97cd85 Tests: Fix obscure RunCMake.CTestSubmit 'drop' case failures


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef97cd8587e7f8d4017b18147aaaca0ec5cb9f0c
commit ef97cd8587e7f8d4017b18147aaaca0ec5cb9f0c
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: Wed Jan 21 16:34:42 2015 -0500

    Tests: Fix obscure RunCMake.CTestSubmit 'drop' case failures
    
    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:


hooks/post-receive
-- 
CMake