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

Moved call to cache CDash version information to cmCTest::initialize. Also added a 3 second timeout when requesting the version from the server. Added an option to the CTestConfiguration that will be used to determine whether to query the version information at all. (Behavior for this setting is not yet defined.) Updated CMake's local CDash version setting to 1.6.

This commit is contained in:
Zach Mullen 2010-02-08 09:47:39 -05:00
parent a7666d303c
commit 41fcf6e155
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CTestConfig.cmake
View File

@ -16,7 +16,8 @@ set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "www.cdash.org")
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=CMake")
set(CTEST_DROP_SITE_CDASH TRUE)
set(CTEST_CDASH_VERSION "1.4")
set(CTEST_CDASH_VERSION "1.6")
set(CTEST_CDASH_QUERY_VERSION TRUE)
# use old trigger stuff so that cmake 2.4 and below will not
# get errors on trigger

1
Modules/DartConfiguration.tcl.in
View File

@ -16,6 +16,7 @@ BuildName: @BUILDNAME@
# Submission information
IsCDash: @CTEST_DROP_SITE_CDASH@
CDashVersion: @CTEST_CDASH_VERSION@
QueryCDashVersion: @CTEST_CDASH_QUERY_VERSION@
DropSite: @DROP_SITE@
DropLocation: @DROP_LOCATION@
DropSiteUser: @DROP_SITE_USER@

10
Source/cmCTest.cxx
View File

@ -349,9 +349,7 @@ cmCTest::cmCTest()
{
it->second->SetCTestInstance(this);
}
// call this so that the information is cached up front
// and not the first time EndTest is called.
this->ShouldCompressTestOutput();
// Make sure we can capture the build tool output.
cmSystemTools::EnableVSConsoleOutput();
}
@ -400,7 +398,7 @@ std::string cmCTest::GetCDashVersion()
std::string url = "http://";
url += this->GetCTestConfiguration("DropSite") + "/CDash/api/getversion.php";
int res = cmCTest::HTTPRequest(url, cmCTest::HTTP_GET, response);
int res = cmCTest::HTTPRequest(url, cmCTest::HTTP_GET, response, "", "", 3);
return res ? this->GetCTestConfiguration("CDashVersion") : response;
#else
@ -473,6 +471,10 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command)
return 0;
}
// call this so that the information is cached up front
// and not the first time EndTest is called.
this->ShouldCompressTestOutput();
if ( this->ProduceXML )
{
// Verify "Testing" directory exists: