mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 20:00:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmCTest: Function ReadCustomConfigurationFileTree never fails

Browse Source
This commit is contained in:
Daniel Pfeifer
2024-10-17 11:14:21 +02:00
committed by Brad King
parent 3c321b6571
commit 60b822da52
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmCTest.cxx
+3 -10
View File
@@ -472,12 +472,7 @@ int cmCTest::Initialize(const std::string& binary_dir,
cm.GetCurrentSnapshot().SetDefaultDefinitions(); cm.GetCurrentSnapshot().SetDefaultDefinitions();
cmGlobalGenerator gg(&cm); cmGlobalGenerator gg(&cm);
cmMakefile mf(&gg, cm.GetCurrentSnapshot()); cmMakefile mf(&gg, cm.GetCurrentSnapshot());
if (!this->ReadCustomConfigurationFileTree(this->Impl->BinaryDir, &mf)) { this->ReadCustomConfigurationFileTree(this->Impl->BinaryDir, &mf);
cmCTestOptionalLog(
this, DEBUG, "Cannot find custom configuration file tree" << std::endl,
quiet);
return 0;
}
if (this->Impl->ProduceXML) { if (this->Impl->ProduceXML) {
// Verify "Testing" directory exists: // Verify "Testing" directory exists:
@@ -3003,8 +2998,8 @@ void cmCTest::SetScheduleType(std::string const& type)
this->Impl->ScheduleType = type; this->Impl->ScheduleType = type;
} }
int cmCTest::ReadCustomConfigurationFileTree(const std::string& dir, void cmCTest::ReadCustomConfigurationFileTree(const std::string& dir,
cmMakefile* mf) cmMakefile* mf)
{ {
bool found = false; bool found = false;
cmCTestLog(this, DEBUG, cmCTestLog(this, DEBUG,
@@ -3060,8 +3055,6 @@ int cmCTest::ReadCustomConfigurationFileTree(const std::string& dir,
handler.second->PopulateCustomVectors(mf); handler.second->PopulateCustomVectors(mf);
} }
} }
return 1;
} }
void cmCTest::PopulateCustomVector(cmMakefile* mf, const std::string& def, void cmCTest::PopulateCustomVector(cmMakefile* mf, const std::string& def,
Source/cmCTest.h
+1 -1
View File
@@ -388,7 +388,7 @@ public:
/** /**
* Read the custom configuration files and apply them to the current ctest * Read the custom configuration files and apply them to the current ctest
*/ */
int ReadCustomConfigurationFileTree(const std::string& dir, cmMakefile* mf); void ReadCustomConfigurationFileTree(const std::string& dir, cmMakefile* mf);
std::vector<std::string>& GetInitialCommandLineArguments(); std::vector<std::string>& GetInitialCommandLineArguments();