kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'ctest-no-cdash-issue-12618' 

52f937a CTest: Do not get CDash version without drop site (#12618)
This commit is contained in:
David Cole 2011-12-16 10:13:12 -05:00 committed by CMake Topic Stage
parent f189c5d7d3 52f937aea8
commit 765e9d30ae
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmCTest.cxx
View File

@ -440,8 +440,12 @@ std::string cmCTest::GetCDashVersion()
std::string cdashUri = this->GetCTestConfiguration("DropLocation"); std::string cdashUri = this->GetCTestConfiguration("DropLocation");
cdashUri = cdashUri.substr(0, cdashUri.find("/submit.php")); cdashUri = cdashUri.substr(0, cdashUri.find("/submit.php"));
url += cdashUri + "/api/getversion.php"; int res = 1;
int res = cmCTest::HTTPRequest(url, cmCTest::HTTP_GET, response, "", "", 3); if ( ! cdashUri.empty() )
{
url += cdashUri + "/api/getversion.php";
res = cmCTest::HTTPRequest(url, cmCTest::HTTP_GET, response, "", "", 3);
}
return res ? this->GetCTestConfiguration("CDashVersion") : response; return res ? this->GetCTestConfiguration("CDashVersion") : response;
#else #else