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

Experimental: Update the Instrumentation UUID

Browse Source 
Update experimental UUID for instrumentation after commit 4683db44a1
(instrumentation: Write index files to data/index/ subdirectory, 2025-09-19)
updated the location of index files.
This commit is contained in:
Martin Duffy
2025-09-23 10:59:54 -04:00
parent ba3c278da2
commit b8014633dc
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Help/dev/experimental.rst
View File

@@ -127,15 +127,15 @@ In order to activate support for the :command:`cmake_instrumentation` command,
set
* variable ``CMAKE_EXPERIMENTAL_INSTRUMENTATION`` to
* value ``2555e60c-9119-46fb-af73-8c54e9b6b326``.
* value ``ec7aa2dc-b87f-45a3-8022-fe01c5f59984``.
To enable instrumentation at the user-level, files should be placed under
either
``<CMAKE_CONFIG_DIR>/instrumentation-2555e60c-9119-46fb-af73-8c54e9b6b326`` or
``<CMAKE_BINARY_DIR>/.cmake/instrumentation-2555e60c-9119-46fb-af73-8c54e9b6b326``.
``<CMAKE_CONFIG_DIR>/instrumentation-ec7aa2dc-b87f-45a3-8022-fe01c5f59984`` or
``<CMAKE_BINARY_DIR>/.cmake/instrumentation-ec7aa2dc-b87f-45a3-8022-fe01c5f59984``.
To include instrumentation data in CTest XML files (for submission to CDash),
you need to set the following environment variables:
* ``CTEST_USE_INSTRUMENTATION=1``
* ``CTEST_EXPERIMENTAL_INSTRUMENTATION=2555e60c-9119-46fb-af73-8c54e9b6b326``
* ``CTEST_EXPERIMENTAL_INSTRUMENTATION=ec7aa2dc-b87f-45a3-8022-fe01c5f59984``

2
Source/cmExperimental.cxx
View File

@@ -65,7 +65,7 @@ cmExperimental::FeatureData const LookupTable[] = {
cmExperimental::TryCompileCondition::Never },
// Instrumentation
{ "Instrumentation",
"2555e60c-9119-46fb-af73-8c54e9b6b326",
"ec7aa2dc-b87f-45a3-8022-fe01c5f59984",
"CMAKE_EXPERIMENTAL_INSTRUMENTATION",
"CMake's support for collecting instrumentation data is experimental. It "
"is meant only for experimentation and feedback to CMake developers.",

2
Tests/RunCMake/ConfigDir/check-reply.cmake
View File

@@ -1,6 +1,6 @@
if (NOT EXISTS ${RunCMake_TEST_BINARY_DIR}/.cmake/api/v1/reply)
set(RunCMake_TEST_FAILED "Failed to read FileAPI query from user config directory")
endif()
if (NOT EXISTS ${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-2555e60c-9119-46fb-af73-8c54e9b6b326/v1/data)
if (NOT EXISTS ${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-ec7aa2dc-b87f-45a3-8022-fe01c5f59984/v1/data)
set(RunCMake_TEST_FAILED "Failed to read Instrumentation query from user config directory")
endif()

0
Tests/RunCMake/ConfigDir/config/instrumentation-2555e60c-9119-46fb-af73-8c54e9b6b326/v1/query/query.json → Tests/RunCMake/ConfigDir/config/instrumentation-ec7aa2dc-b87f-45a3-8022-fe01c5f59984/v1/query/query.json
View File

2
Tests/RunCMake/Instrumentation/RunCMakeTest.cmake
View File

@@ -23,7 +23,7 @@ function(instrument test)
)
cmake_parse_arguments(ARGS "${OPTIONS}" "CHECK_SCRIPT;CONFIGURE_ARG" "" ${ARGN})
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${test})
set(uuid "2555e60c-9119-46fb-af73-8c54e9b6b326")
set(uuid "ec7aa2dc-b87f-45a3-8022-fe01c5f59984")
set(v1 ${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-${uuid}/v1)
set(v1 ${v1} PARENT_SCOPE)
set(query_dir ${CMAKE_CURRENT_LIST_DIR}/query)

2
Tests/RunCMake/Instrumentation/project/CMakeLists.txt
View File

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.30)
project(instrumentation)
enable_testing()
if (EXISTS ${INSTRUMENT_COMMAND_FILE})
set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "2555e60c-9119-46fb-af73-8c54e9b6b326")
set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "ec7aa2dc-b87f-45a3-8022-fe01c5f59984")
include(${INSTRUMENT_COMMAND_FILE})
endif()

2
Tests/RunCMake/ctest_instrumentation/CMakeLists.txt.in
View File

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
@CASE_CMAKELISTS_PREFIX_CODE@
project(CTestInstrumentation@CASE_NAME@)
if(USE_INSTRUMENTATION)
set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "2555e60c-9119-46fb-af73-8c54e9b6b326")
set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "ec7aa2dc-b87f-45a3-8022-fe01c5f59984")
endif()
include(CTest)
add_executable(main main.c)

2
Tests/RunCMake/ctest_instrumentation/InstrumentationInCTestXML-check.cmake
View File

@@ -1,4 +1,4 @@
set(timingDir "${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-2555e60c-9119-46fb-af73-8c54e9b6b326/v1")
set(timingDir "${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-ec7aa2dc-b87f-45a3-8022-fe01c5f59984/v1")
file(READ "${timingDir}/query/generated/query-0.json" jsonData)
string(JSON options GET "${jsonData}" options)
if (options MATCHES cdashVerbose AND NOT ${RunCMake_USE_VERBOSE_INSTRUMENTATION})

2
Tests/RunCMake/ctest_instrumentation/RunCMakeTest.cmake
View File

@@ -10,7 +10,7 @@ function(run_InstrumentationInCTestXML CASE_NAME)
set(RunCMake_USE_VERBOSE_INSTRUMENTATION FALSE)
endif()
if(ARGS_USE_INSTRUMENTATION_ENV_VARS)
set(ENV{CTEST_EXPERIMENTAL_INSTRUMENTATION} "2555e60c-9119-46fb-af73-8c54e9b6b326")
set(ENV{CTEST_EXPERIMENTAL_INSTRUMENTATION} "ec7aa2dc-b87f-45a3-8022-fe01c5f59984")
set(ENV{CTEST_USE_INSTRUMENTATION} "1")
set(RunCMake_USE_INSTRUMENTATION TRUE)
else()

2
Tests/RunCMake/ctest_labels_for_subprojects/RunCMakeTest.cmake
View File

@@ -38,7 +38,7 @@ file(COPY "${CTEST_RUNCMAKE_SOURCE_DIRECTORY}/MyThirdPartyDependency"
if(USE_INSTRUMENTATION)
set(CASE_CMAKELISTS_SUFFIX_CODE [[
add_subdirectory(MyThirdPartyDependency)
set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "2555e60c-9119-46fb-af73-8c54e9b6b326")
set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "ec7aa2dc-b87f-45a3-8022-fe01c5f59984")
cmake_instrumentation(DATA_VERSION 1 API_VERSION 1)
]])
set(RunCMake-check-file CTestScriptVariableCommandLine-check.cmake)