From e47dc299679c57c9e8e43c1ac5c8fb08836ac566 Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Thu, 6 Mar 2025 11:26:56 +0100 Subject: [PATCH] cmCTestStartCommand: Remove unnecessary code We called `UpdateCTestConfiguration` but set an internal option that made it a no-op. Instead, just do not call it. --- Source/CTest/cmCTestStartCommand.cxx | 2 -- Source/cmCTest.cxx | 10 ---------- Source/cmCTest.h | 6 ------ 3 files changed, 18 deletions(-) diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx index 0a4ef09268..e2b897e3ec 100644 --- a/Source/CTest/cmCTestStartCommand.cxx +++ b/Source/CTest/cmCTestStartCommand.cxx @@ -139,7 +139,6 @@ bool cmCTestStartCommand::InitialPass(std::vector const& args, return false; } - this->CTest->SetSuppressUpdatingCTestConfiguration(true); int model; if (smodel) { model = cmCTest::GetTestModelFromString(smodel); @@ -183,7 +182,6 @@ bool cmCTestStartCommand::InitialPass(std::vector const& args, &mf, "BuildName", "CTEST_BUILD_NAME", quiet); this->CTest->Initialize(bld_dir); - this->CTest->UpdateCTestConfiguration(); cmCTestOptionalLog( this->CTest, OUTPUT, diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 0a77b3842c..eaa3eccda5 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -173,8 +173,6 @@ struct cmCTest::Private bool CompressXMLFiles = false; bool CompressTestOutput = true; - bool SuppressUpdatingCTestConfiguration = false; - bool Debug = false; bool Quiet = false; @@ -529,9 +527,6 @@ bool cmCTest::ReadExistingTag(bool quiet) bool cmCTest::UpdateCTestConfiguration() { - if (this->Impl->SuppressUpdatingCTestConfiguration) { - return true; - } std::string fileName = this->Impl->BinaryDir + "/CTestConfiguration.ini"; if (!cmSystemTools::FileExists(fileName)) { fileName = this->Impl->BinaryDir + "/DartConfiguration.tcl"; @@ -3171,11 +3166,6 @@ void cmCTest::ClearSubmitFiles(Part part) this->Impl->Parts[part].SubmitFiles.clear(); } -void cmCTest::SetSuppressUpdatingCTestConfiguration(bool val) -{ - this->Impl->SuppressUpdatingCTestConfiguration = val; -} - void cmCTest::AddCTestConfigurationOverwrite(std::string const& overStr) { size_t epos = overStr.find('='); diff --git a/Source/cmCTest.h b/Source/cmCTest.h index 339c7e2cfa..53e9b0eff4 100644 --- a/Source/cmCTest.h +++ b/Source/cmCTest.h @@ -298,12 +298,6 @@ public: /** Decode a URL to the original string. */ 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. *