summaryrefslogtreecommitdiffstats
path: root/Source/cmCTest.cxx
diff options
context:
space:
mode:
authorZach Mullen <zach.mullen@kitware.com>2010-08-18 13:58:27 (GMT)
committerZach Mullen <zach.mullen@kitware.com>2010-08-18 13:58:27 (GMT)
commit7dbc1a2ebd140461c2478e6fdd54eb919f66c25d (patch)
tree5b27ebfb5f6dfbba466658d1f409de0102e55d66 /Source/cmCTest.cxx
parenta3d796b9065374ea246b4ffeacc92b7c76120c9b (diff)
downloadCMake-7dbc1a2ebd140461c2478e6fdd54eb919f66c25d.zip
CMake-7dbc1a2ebd140461c2478e6fdd54eb919f66c25d.tar.gz
CMake-7dbc1a2ebd140461c2478e6fdd54eb919f66c25d.tar.bz2
Fix hard-coded CDash URI in version query
Diffstat (limited to 'Source/cmCTest.cxx')
-rw-r--r--Source/cmCTest.cxx10
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 3a777d5..d12fde0 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -410,10 +410,14 @@ std::string cmCTest::GetCDashVersion()
//First query the server. If that fails, fall back to the local setting
std::string response;
std::string url = "http://";
- url += this->GetCTestConfiguration("DropSite") + "/CDash/api/getversion.php";
-
+ url += this->GetCTestConfiguration("DropSite");
+
+ 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);
-
+
return res ? this->GetCTestConfiguration("CDashVersion") : response;
#else
return this->GetCTestConfiguration("CDashVersion");