mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 22:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmCTest: Remove dead code

Browse Source 
The option 'ctest-config' is ignored.
This commit is contained in:
Betsy McPhail
2017-10-11 19:39:04 -04:00
parent a7347c022e
commit e80dc2ad7f
4 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Help/manual/ctest.1.rst
View File

@@ -338,13 +338,6 @@ Options
This is useful if the build will not finish in one day.
``--ctest-config``
The configuration file used to initialize CTest state when submitting dashboards.
This option tells CTest to use different initialization file instead
of CTestConfiguration.tcl. This way multiple initialization files
can be used for example to submit to multiple dashboards.
``--overwrite``
Overwrite CTest configuration option.

10
Source/cmCTest.cxx
View File

@@ -282,7 +282,6 @@ cmCTest::cmCTest()
this->GlobalTimeout = 0;
this->LastStopTimeout = 24 * 60 * 60;
this->CompressXMLFiles = false;
this->CTestConfigFile.clear();
this->ScheduleType.clear();
this->StopTime.clear();
this->NextDayStopTime = false;
@@ -623,12 +622,9 @@ bool cmCTest::UpdateCTestConfiguration()
if (this->SuppressUpdatingCTestConfiguration) {
return true;
}
std::string fileName = this->CTestConfigFile;
if (fileName.empty()) {
fileName = this->BinaryDir + "/CTestConfiguration.ini";
if (!cmSystemTools::FileExists(fileName.c_str())) {
fileName = this->BinaryDir + "/DartConfiguration.tcl";
}
std::string fileName = this->BinaryDir + "/CTestConfiguration.ini";
if (!cmSystemTools::FileExists(fileName.c_str())) {
fileName = this->BinaryDir + "/DartConfiguration.tcl";
}
cmCTestLog(this, HANDLER_VERBOSE_OUTPUT,
"UpdateCTestConfiguration from :" << fileName << "\n");

1
Source/cmCTest.h
View File

@@ -487,7 +487,6 @@ private:
/** Map of configuration properties */
typedef std::map<std::string, std::string> CTestConfigurationMap;
std::string CTestConfigFile;
// TODO: The ctest configuration should be a hierarchy of
// configuration option sources: command-line, script, ini file.
// Then the ini file can get re-loaded whenever it changes without

2
Source/ctest.cxx
View File

@@ -104,8 +104,6 @@ static const char* cmDocumentationOptions[][2] = {
{ "--test-timeout", "The time limit in seconds, internal use only." },
{ "--test-load", "CPU load threshold for starting new parallel tests." },
{ "--tomorrow-tag", "Nightly or experimental starts with next day tag." },
{ "--ctest-config", "The configuration file used to initialize CTest state "
"when submitting dashboards." },
{ "--overwrite", "Overwrite CTest configuration option." },
{ "--extra-submit <file>[;<file>]", "Submit extra files to the dashboard." },
{ "--force-new-ctest-process",