Browse Source

cmCTestStartCommand: Remove unnecessary code

We called `UpdateCTestConfiguration` but set an internal option
that made it a no-op.  Instead, just do not call it.
Daniel Pfeifer 9 months ago
parent
commit
e47dc29967
3 changed files with 0 additions and 18 deletions
  1. 0 2
      Source/CTest/cmCTestStartCommand.cxx
  2. 0 10
      Source/cmCTest.cxx
  3. 0 6
      Source/cmCTest.h

+ 0 - 2
Source/CTest/cmCTestStartCommand.cxx

@@ -139,7 +139,6 @@ bool cmCTestStartCommand::InitialPass(std::vector<std::string> 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<std::string> const& args,
     &mf, "BuildName", "CTEST_BUILD_NAME", quiet);
 
   this->CTest->Initialize(bld_dir);
-  this->CTest->UpdateCTestConfiguration();
 
   cmCTestOptionalLog(
     this->CTest, OUTPUT,

+ 0 - 10
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('=');

+ 0 - 6
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.
    *