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

Merge topic 'instrumentation-quote-command'

Browse Source 
4e7b37cad3 instrumentation: Quote command arguments to preserve separation
99cd4d979b CTest: Fix startTime in test snippets when using instrumentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10386
This commit is contained in:
Brad King
2025-02-25 14:38:36 +00:00
committed by Kitware Robot
parent 2111f6f872 4e7b37cad3
commit 4af0f637c4
8 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Help/manual/cmake-instrumentation.7.rst
View File

@@ -369,7 +369,7 @@ Example:
{
"version": 1,
"command" : "/usr/bin/c++ -MD -MT CMakeFiles/main.dir/main.cxx.o -MF CMakeFiles/main.dir/main.cxx.o.d -o CMakeFiles/main.dir/main.cxx.o -c <src>/main.cxx",
"command" : "\"/usr/bin/c++\" \"-MD\" \"-MT\" \"CMakeFiles/main.dir/main.cxx.o\" \"-MF\" \"CMakeFiles/main.dir/main.cxx.o.d\" \"-o\" \"CMakeFiles/main.dir/main.cxx.o\" \"-c\" \"<src>/main.cxx\"",
"role" : "compile",
"return" : 1,
"target": "main",

1
Source/CTest/cmProcess.cxx
View File

@@ -57,6 +57,7 @@ bool cmProcess::StartProcess(uv_loop_t& loop, std::vector<size_t>* affinity)
return false;
}
this->StartTime = std::chrono::steady_clock::now();
this->SystemStartTime = std::chrono::system_clock::now();
this->ProcessArgs.clear();
// put the command as arg0
this->ProcessArgs.push_back(this->Command.c_str());

2
Source/cmInstrumentation.cxx
View File

@@ -538,7 +538,7 @@ std::string cmInstrumentation::GetCommandStr(
{
std::string command_str;
for (size_t i = 0; i < args.size(); ++i) {
command_str = cmStrCat(command_str, args[i]);
command_str = cmStrCat(command_str, '"', args[i], '"');
if (i < args.size() - 1) {
command_str = cmStrCat(command_str, ' ');
}

2
Tests/RunCMake/Instrumentation/check-data-dir.cmake
View File

@@ -111,7 +111,7 @@ foreach(snippet IN LISTS snippets)
# Verify command args were passed
if (filename MATCHES "^cmakeBuild|^ctest")
string(JSON command GET "${contents}" command)
if (NOT command MATCHES "-.* Debug")
if (NOT command MATCHES "Debug")
snippet_error(${snippet} "Command value missing passed arguments")
endif()
endif()

2
Tests/RunCMake/Instrumentation/query/cmake-command-make-program.cmake
View File

@@ -3,5 +3,5 @@ cmake_instrumentation(
API_VERSION 1
DATA_VERSION 1
HOOKS preBuild postBuild
CALLBACK "\"${CMAKE_COMMAND}\" -P \"${hook_path}\" 0"
CALLBACK ${CMAKE_COMMAND} -P ${hook_path} 0
)

6
Tests/RunCMake/Instrumentation/query/cmake-command.cmake
View File

@@ -8,7 +8,7 @@
API_VERSION 1
DATA_VERSION 1
HOOKS postGenerate
CALLBACK \"${CMAKE_COMMAND}\" -E echo callback1
CALLBACK ${CMAKE_COMMAND} -E echo callback1
)
# Query 2
cmake_instrumentation(
@@ -16,6 +16,6 @@
DATA_VERSION 1
HOOKS postCMakeBuild
QUERIES staticSystemInformation dynamicSystemInformation
CALLBACK \"${CMAKE_COMMAND}\" -E echo callback2
CALLBACK \"${CMAKE_COMMAND}\" -E echo callback3
CALLBACK ${CMAKE_COMMAND} -E echo callback2
CALLBACK ${CMAKE_COMMAND} -E echo callback3
)

2
Tests/RunCMake/Instrumentation/query/generated/query-1.json.in
View File

@@ -1,7 +1,7 @@
{
"callbacks" :
[
"\"@CMAKE_COMMAND@\" -E echo callback1"
"\"@CMAKE_COMMAND@\" \"-E\" \"echo\" \"callback1\""
],
"hooks" :
[

4
Tests/RunCMake/Instrumentation/query/generated/query-2.json.in
View File

@@ -1,8 +1,8 @@
{
"callbacks" :
[
"\"@CMAKE_COMMAND@\" -E echo callback2",
"\"@CMAKE_COMMAND@\" -E echo callback3"
"\"@CMAKE_COMMAND@\" \"-E\" \"echo\" \"callback2\"",
"\"@CMAKE_COMMAND@\" \"-E\" \"echo\" \"callback3\""
],
"hooks" :
[