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

cmake: Store lowercase command names in profiling output

Browse Source 
This ensures commands can be properly aggregated by tools
processing the profiling output.

Fixes: #20946
This commit is contained in:
Craig Scott 2020-07-13 10:22:22 +10:00
parent 6ab08c4e99
commit 7cf2f7d2af
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmMakefileProfilingData.cxx
View File

@ -58,7 +58,7 @@ void cmMakefileProfilingData::StartEntry(const cmListFileFunction& lff,
cmsys::SystemInformation info;
Json::Value v;
v["ph"] = "B";
v["name"] = lff.Name.Original;
v["name"] = lff.Name.Lower;
v["cat"] = "cmake";
v["ts"] = Json::Value::UInt64(
std::chrono::duration_cast<std::chrono::microseconds>(

13
Tests/RunCMake/CommandLine/ProfilingTest-check.cmake
View File

@ -16,3 +16,16 @@ if (NOT JSON_TRAILER MATCHES "^}]$")
set(RunCMake_TEST_FAILED "Expected valid JSON end")
return()
endif()
file(STRINGS ${ProfilingTestOutput} upperCaseCommand
REGEX [["name"[ ]*:[ ]*"__TESTING_COMMAND_CASE"]])
if (NOT "${upperCaseCommand}" STREQUAL "")
set(RunCMake_TEST_FAILED "Command name not stored in lowercase")
endif()
file(STRINGS ${ProfilingTestOutput} lowerCaseCommand
REGEX [["name"[ ]*:[ ]*"__testing_command_case"]])
list(LENGTH lowerCaseCommand numInvocations)
if (NOT numInvocations EQUAL 1)
set(RunCMake_TEST_FAILED
"Unexpected number of lowercase command names: ${numInvocations}")
endif()

6
Tests/RunCMake/CommandLine/ProfilingTest.cmake
View File

@ -1 +1,5 @@
# This file is intentionally left blank
function(__testing_command_case)
endfunction()
# This must not appear in the profiling output as uppercase
__TESTING_COMMAND_CASE()