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 46eba8bd6a5161a62900c42532b8473633481de1 (commit)
via 52f937aea81eaa531b46c0c8e791e1d1391c705d (commit)
from 5074cd721ba6c295616b676fc458d86067b6c6f2 (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=46eba8bd6a5161a62900c42532b8473633481de1
commit 46eba8bd6a5161a62900c42532b8473633481de1
Merge: 5074cd7 52f937a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Dec 12 09:39:56 2011 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Dec 12 09:39:56 2011 -0500
Merge topic 'ctest-no-cdash-issue-12618' into next
52f937a CTest: Do not get CDash version without drop site (#12618)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52f937aea81eaa531b46c0c8e791e1d1391c705d
commit 52f937aea81eaa531b46c0c8e791e1d1391c705d
Author: Valat Sébastien <sebastien.valat....@orange.fr>
AuthorDate: Sat Dec 10 23:04:51 2011 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Dec 12 09:35:09 2011 -0500
CTest: Do not get CDash version without drop site (#12618)
Avoid sleep for 3 seconds in ctest if CDashDropSite is empty.
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 14055a4..3f7fdc7 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -440,8 +440,12 @@ std::string cmCTest::GetCDashVersion()
std::string cdashUri = this->GetCTestConfiguration("DropLocation");
cdashUri = cdashUri.substr(0, cdashUri.find("/submit.php"));
- url += cdashUri + "/api/getversion.php";
- int res = cmCTest::HTTPRequest(url, cmCTest::HTTP_GET, response, "", "", 3);
+ int res = 1;
+ if ( ! cdashUri.empty() )
+ {
+ url += cdashUri + "/api/getversion.php";
+ res = cmCTest::HTTPRequest(url, cmCTest::HTTP_GET, response, "", "", 3);
+ }
return res ? this->GetCTestConfiguration("CDashVersion") : response;
#else
-----------------------------------------------------------------------
Summary of changes:
Source/cmCTest.cxx | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
