diff options
-rw-r--r-- | Help/manual/ctest.1.rst | 7 | ||||
-rw-r--r-- | Source/cmCTest.cxx | 10 | ||||
-rw-r--r-- | Source/cmCTest.h | 1 | ||||
-rw-r--r-- | Source/ctest.cxx | 2 |
4 files changed, 3 insertions, 17 deletions
diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index 423f1ca..d586e22 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -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. diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 37ff901..92da9ab 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -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"); diff --git a/Source/cmCTest.h b/Source/cmCTest.h index dbd67dc..a2d6fc3 100644 --- a/Source/cmCTest.h +++ b/Source/cmCTest.h @@ -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 diff --git a/Source/ctest.cxx b/Source/ctest.cxx index f6466fa..ad5fec0 100644 --- a/Source/ctest.cxx +++ b/Source/ctest.cxx @@ -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", |