diff options
| author | David Cole <david.cole@kitware.com> | 2011-12-16 15:13:12 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-12-16 15:13:12 (GMT) |
| commit | 765e9d30ae970a9075c6dd463e881a3635d1fabc (patch) | |
| tree | 09b24a55f68aa47756885e3f7ebc25ab9694d98d | |
| parent | f189c5d7d340eba74b0a812fb873695dba487316 (diff) | |
| parent | 52f937aea81eaa531b46c0c8e791e1d1391c705d (diff) | |
| download | CMake-765e9d30ae970a9075c6dd463e881a3635d1fabc.zip CMake-765e9d30ae970a9075c6dd463e881a3635d1fabc.tar.gz CMake-765e9d30ae970a9075c6dd463e881a3635d1fabc.tar.bz2 | |
Merge topic 'ctest-no-cdash-issue-12618'
52f937a CTest: Do not get CDash version without drop site (#12618)
| -rw-r--r-- | Source/cmCTest.cxx | 8 |
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 |