|
|
@@ -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");
|