echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmCTest: Cleanup ReadCustomConfigurationFileTree function

Browse Source
This commit is contained in:
Daniel Pfeifer 2024-10-21 21:46:29 +02:00
parent 812f8cce5a
commit 66460dc4d7
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Source/cmCTest.cxx
View File

@ -10,6 +10,7 @@
#include <cstdlib>
#include <cstring>
#include <ctime>
#include <initializer_list>
#include <iostream>
#include <map>
#include <ratio>
@ -31,7 +32,6 @@
#include "cmsys/Base64.h"
#include "cmsys/Directory.hxx"
#include "cmsys/FStream.hxx"
#include "cmsys/Glob.hxx"
#include "cmsys/RegularExpression.hxx"
#include "cmsys/SystemInformation.hxx"
#if defined(_WIN32)
@ -2944,14 +2944,22 @@ void cmCTest::SetScheduleType(std::string const& type)
void cmCTest::ReadCustomConfigurationFileTree(const std::string& dir,
cmMakefile* mf)
{
bool found = false;
cmCTestLog(this, DEBUG,
"* Read custom CTest configuration directory: " << dir
<< std::endl);
std::string fname = cmStrCat(dir, "/CTestCustom.cmake");
cmCTestLog(this, DEBUG, "* Check for file: " << fname << std::endl);
if (cmSystemTools::FileExists(fname)) {
auto const fname = [this, &dir]() -> std::string {
for (char const* ext : { ".cmake", ".ctest" }) {
std::string path = cmStrCat(dir, "/CTestCustom", ext);
cmCTestLog(this, DEBUG, "* Check for file: " << path << std::endl);
if (cmSystemTools::FileExists(path)) {
return path;
}
}
return "";
}();
if (!fname.empty()) {
cmCTestLog(this, DEBUG,
"* Read custom CTest configuration file: " << fname
<< std::endl);
@ -2963,31 +2971,10 @@ void cmCTest::ReadCustomConfigurationFileTree(const std::string& dir,
"Problem reading custom configuration: " << fname
<< std::endl);
}
found = true;
if (erroroc) {
cmSystemTools::SetErrorOccurred();
}
}
std::string rexpr = cmStrCat(dir, "/CTestCustom.ctest");
cmCTestLog(this, DEBUG, "* Check for file: " << rexpr << std::endl);
if (!found && cmSystemTools::FileExists(rexpr)) {
cmsys::Glob gl;
gl.RecurseOn();
gl.FindFiles(rexpr);
std::vector<std::string>& files = gl.GetFiles();
for (const std::string& file : files) {
cmCTestLog(this, DEBUG,
"* Read custom CTest configuration file: " << file
<< std::endl);
if (!mf->ReadListFile(file) || cmSystemTools::GetErrorOccurredFlag()) {
cmCTestLog(this, ERROR_MESSAGE,
"Problem reading custom configuration: " << file
<< std::endl);
}
}
found = true;
}
}
void cmCTest::PopulateCustomVector(cmMakefile* mf, const std::string& def,