mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-02 03:39:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

ctest: Don't modify build and site names

Browse Source 
CTest currently removes non-filename characters from CTEST_SITE and
CTEST_BUILDNAME in an inconsistent way, which leads to unconnected
information on CDash.  Non-filename characters actually don't cause
any issue in CDash at all, nor are they invalid XML.  The only place
where removing them may be needed is when an actual filename is
constructed.

Remove the filtering from the SafeBuildIdField function and place
it where a filename is constructed.
This commit is contained in:
Daniel Pfeifer
2025-06-28 10:10:06 +02:00
parent d80b5a9ac2
commit 2aa2c9af97
2 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/CTest/cmCTestSubmitHandler.cxx
View File

@@ -9,8 +9,10 @@
#include <cm/iomanip>
#include <cm/optional>
#include <cm/string>
#include <cm/string_view>
#include <cmext/algorithm>
#include <cmext/string_view>
#include <cm3p/curl/curl.h>
#include <cm3p/json/reader.h>
@@ -226,6 +228,11 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(
std::string remote_file =
remoteprefix + cmSystemTools::GetFilenameName(file);
// Erase non-filename and non-space whitespace characters.
cm::erase_if(remote_file, [](char c) {
return cm::contains("\\:*?\"<>|\n\r\t\f\v"_s, c);
});
*this->LogFile << "\tUpload file: " << local_file << " to "
<< remote_file << std::endl;

27
Source/cmCTest.cxx
View File

@@ -1005,32 +1005,7 @@ bool cmCTest::RunMakeCommand(std::string const& command, std::string& output,
std::string cmCTest::SafeBuildIdField(std::string const& value)
{
std::string safevalue(value);
if (!safevalue.empty()) {
// Disallow non-filename and non-space whitespace characters.
// If they occur, replace them with ""
//
char const* disallowed = "\\:*?\"<>|\n\r\t\f\v";
if (safevalue.find_first_of(disallowed) != std::string::npos) {
std::string::size_type i = 0;
std::string::size_type n = strlen(disallowed);
char replace[2];
replace[1] = 0;
for (i = 0; i < n; ++i) {
replace[0] = disallowed[i];
cmSystemTools::ReplaceString(safevalue, replace, "");
}
}
}
if (safevalue.empty()) {
safevalue = "(empty)";
}
return safevalue;
return value.empty() ? "(empty)" : value;
}
void cmCTest::StartXML(cmXMLWriter& xml, cmake* cm, bool append)