summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValat Sébastien <sebastien.valat.dev@orange.fr>2011-12-10 22:04:51 (GMT)
committerBrad King <brad.king@kitware.com>2011-12-12 14:35:09 (GMT)
commit52f937aea81eaa531b46c0c8e791e1d1391c705d (patch)
treef0bba27a81958448775eea3ee1be6661c0d6b239
parent99771d55beee37d8e4a1cff19570c2847ce221cd (diff)
downloadCMake-52f937aea81eaa531b46c0c8e791e1d1391c705d.zip
CMake-52f937aea81eaa531b46c0c8e791e1d1391c705d.tar.gz
CMake-52f937aea81eaa531b46c0c8e791e1d1391c705d.tar.bz2
CTest: Do not get CDash version without drop site (#12618)
Avoid sleep for 3 seconds in ctest if CDashDropSite is empty.
-rw-r--r--Source/cmCTest.cxx8
1 files changed, 6 insertions, 2 deletions
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