Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-16 05:26:58 +08:00
Code Issues Projects Releases Wiki Activity

cmCTestStartCommand: Remove unnecessary code

Browse Source 
We called `UpdateCTestConfiguration` but set an internal option
that made it a no-op.  Instead, just do not call it.
This commit is contained in:
Daniel Pfeifer
2025-03-06 11:26:56 +01:00
committed by Brad King
parent f54699d31d
commit e47dc29967
3 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CTest/cmCTestStartCommand.cxx
View File

@@ -139,7 +139,6 @@ bool cmCTestStartCommand::InitialPass(std::vector<std::string> const& args,
return false; return false;
} }
this->CTest->SetSuppressUpdatingCTestConfiguration(true);
int model; int model;
if (smodel) { if (smodel) {
model = cmCTest::GetTestModelFromString(smodel); model = cmCTest::GetTestModelFromString(smodel);
@@ -183,7 +182,6 @@ bool cmCTestStartCommand::InitialPass(std::vector<std::string> const& args,
&mf, "BuildName", "CTEST_BUILD_NAME", quiet); &mf, "BuildName", "CTEST_BUILD_NAME", quiet);
this->CTest->Initialize(bld_dir); this->CTest->Initialize(bld_dir);
this->CTest->UpdateCTestConfiguration();
cmCTestOptionalLog( cmCTestOptionalLog(
this->CTest, OUTPUT, this->CTest, OUTPUT,

10
Source/cmCTest.cxx
View File

@@ -173,8 +173,6 @@ struct cmCTest::Private
bool CompressXMLFiles = false; bool CompressXMLFiles = false;
bool CompressTestOutput = true; bool CompressTestOutput = true;
bool SuppressUpdatingCTestConfiguration = false;
bool Debug = false; bool Debug = false;
bool Quiet = false; bool Quiet = false;
@@ -529,9 +527,6 @@ bool cmCTest::ReadExistingTag(bool quiet)
bool cmCTest::UpdateCTestConfiguration() bool cmCTest::UpdateCTestConfiguration()
{ {
if (this->Impl->SuppressUpdatingCTestConfiguration) {
return true;
}
std::string fileName = this->Impl->BinaryDir + "/CTestConfiguration.ini"; std::string fileName = this->Impl->BinaryDir + "/CTestConfiguration.ini";
if (!cmSystemTools::FileExists(fileName)) { if (!cmSystemTools::FileExists(fileName)) {
fileName = this->Impl->BinaryDir + "/DartConfiguration.tcl"; fileName = this->Impl->BinaryDir + "/DartConfiguration.tcl";
@@ -3171,11 +3166,6 @@ void cmCTest::ClearSubmitFiles(Part part)
this->Impl->Parts[part].SubmitFiles.clear(); this->Impl->Parts[part].SubmitFiles.clear();
} }
void cmCTest::SetSuppressUpdatingCTestConfiguration(bool val)
{
this->Impl->SuppressUpdatingCTestConfiguration = val;
}
void cmCTest::AddCTestConfigurationOverwrite(std::string const& overStr) void cmCTest::AddCTestConfigurationOverwrite(std::string const& overStr)
{ {
size_t epos = overStr.find('='); size_t epos = overStr.find('=');

6
Source/cmCTest.h
View File

@@ -298,12 +298,6 @@ public:
/** Decode a URL to the original string. */ /** Decode a URL to the original string. */
static std::string DecodeURL(std::string const&); static std::string DecodeURL(std::string const&);
/**
* Should ctect configuration be updated. When using new style ctest
* script, this should be true.
*/
void SetSuppressUpdatingCTestConfiguration(bool val);
/** /**
* Add overwrite to ctest configuration. * Add overwrite to ctest configuration.
* *