Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-19 19:43:23 +08:00
Code Issues Projects Releases Wiki Activity

Experimental: Update the Instrumentation UUID

Browse Source 
Update experimental UUID for instrumentation after commit afa94bae1e
(instrumentation: Rename queries field to options, 2025-07-08) broke compatibility
for old queries.
This commit is contained in:
Martin Duffy
2025-07-14 16:05:14 -04:00
parent 9dec460c8c
commit 21ac285cd8
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 set
* variable ``CMAKE_EXPERIMENTAL_INSTRUMENTATION`` to * variable ``CMAKE_EXPERIMENTAL_INSTRUMENTATION`` to
* value ``a37d1069-1972-4901-b9c9-f194aaf2b6e0``. * value ``d16a3082-c4e1-489b-b90c-55750a334f27``.
To enable instrumentation at the user-level, files should be placed under To enable instrumentation at the user-level, files should be placed under
either either
``<CMAKE_CONFIG_DIR>/instrumentation-a37d1069-1972-4901-b9c9-f194aaf2b6e0`` or ``<CMAKE_CONFIG_DIR>/instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27`` or
``<CMAKE_BINARY_DIR>/.cmake/instrumentation-a37d1069-1972-4901-b9c9-f194aaf2b6e0``. ``<CMAKE_BINARY_DIR>/.cmake/instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27``.
To include instrumentation data in CTest XML files (for submission to CDash), To include instrumentation data in CTest XML files (for submission to CDash),
you need to set the following environment variables: you need to set the following environment variables:
* ``CTEST_USE_INSTRUMENTATION=1`` * ``CTEST_USE_INSTRUMENTATION=1``
* ``CTEST_EXPERIMENTAL_INSTRUMENTATION=a37d1069-1972-4901-b9c9-f194aaf2b6e0`` * ``CTEST_EXPERIMENTAL_INSTRUMENTATION=d16a3082-c4e1-489b-b90c-55750a334f27``

2
Source/cmExperimental.cxx
View File

@@ -73,7 +73,7 @@ cmExperimental::FeatureData const LookupTable[] = {
cmExperimental::TryCompileCondition::Never }, cmExperimental::TryCompileCondition::Never },
// Instrumentation // Instrumentation
{ "Instrumentation", { "Instrumentation",
"a37d1069-1972-4901-b9c9-f194aaf2b6e0", "d16a3082-c4e1-489b-b90c-55750a334f27",
"CMAKE_EXPERIMENTAL_INSTRUMENTATION", "CMAKE_EXPERIMENTAL_INSTRUMENTATION",
"CMake's support for collecting instrumentation data is experimental. It " "CMake's support for collecting instrumentation data is experimental. It "
"is meant only for experimentation and feedback to CMake developers.", "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) if (NOT EXISTS ${RunCMake_TEST_BINARY_DIR}/.cmake/api/v1/reply)
set(RunCMake_TEST_FAILED "Failed to read FileAPI query from user config directory") set(RunCMake_TEST_FAILED "Failed to read FileAPI query from user config directory")
endif() endif()
if (NOT EXISTS ${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-a37d1069-1972-4901-b9c9-f194aaf2b6e0/v1/data) if (NOT EXISTS ${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27/v1/data)
set(RunCMake_TEST_FAILED "Failed to read Instrumentation query from user config directory") set(RunCMake_TEST_FAILED "Failed to read Instrumentation query from user config directory")
endif() endif()

0
Tests/RunCMake/ConfigDir/config/instrumentation-a37d1069-1972-4901-b9c9-f194aaf2b6e0/v1/query/query.json → Tests/RunCMake/ConfigDir/config/instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27/v1/query/query.json
View File

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

@@ -9,7 +9,7 @@ function(instrument test)
"BUILD;BUILD_MAKE_PROGRAM;INSTALL;TEST;COPY_QUERIES;COPY_QUERIES_GENERATED;NO_WARN;STATIC_QUERY;DYNAMIC_QUERY;INSTALL_PARALLEL;MANUAL_HOOK" "BUILD;BUILD_MAKE_PROGRAM;INSTALL;TEST;COPY_QUERIES;COPY_QUERIES_GENERATED;NO_WARN;STATIC_QUERY;DYNAMIC_QUERY;INSTALL_PARALLEL;MANUAL_HOOK"
"CHECK_SCRIPT;CONFIGURE_ARG" "" ${ARGN}) "CHECK_SCRIPT;CONFIGURE_ARG" "" ${ARGN})
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${test}) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${test})
set(uuid "a37d1069-1972-4901-b9c9-f194aaf2b6e0") set(uuid "d16a3082-c4e1-489b-b90c-55750a334f27")
set(v1 ${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-${uuid}/v1) set(v1 ${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-${uuid}/v1)
set(query_dir ${CMAKE_CURRENT_LIST_DIR}/query) 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) project(instrumentation)
enable_testing() enable_testing()
if (EXISTS ${INSTRUMENT_COMMAND_FILE}) if (EXISTS ${INSTRUMENT_COMMAND_FILE})
set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "a37d1069-1972-4901-b9c9-f194aaf2b6e0") set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "d16a3082-c4e1-489b-b90c-55750a334f27")
include(${INSTRUMENT_COMMAND_FILE}) include(${INSTRUMENT_COMMAND_FILE})
endif() 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@ @CASE_CMAKELISTS_PREFIX_CODE@
project(CTestInstrumentation@CASE_NAME@) project(CTestInstrumentation@CASE_NAME@)
if(USE_INSTRUMENTATION) if(USE_INSTRUMENTATION)
set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "a37d1069-1972-4901-b9c9-f194aaf2b6e0") set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "d16a3082-c4e1-489b-b90c-55750a334f27")
endif() endif()
include(CTest) include(CTest)
add_executable(main main.c) 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-a37d1069-1972-4901-b9c9-f194aaf2b6e0/v1") set(timingDir "${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27/v1")
file(READ "${timingDir}/query/generated/query-0.json" jsonData) file(READ "${timingDir}/query/generated/query-0.json" jsonData)
string(JSON options GET "${jsonData}" options) string(JSON options GET "${jsonData}" options)
if (options MATCHES cdashVerbose AND NOT ${RunCMake_USE_VERBOSE_INSTRUMENTATION}) 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 USE_INSTRUMENTATION USE_VERBOSE
endif() endif()
if(USE_INSTRUMENTATION) if(USE_INSTRUMENTATION)
set(ENV{CTEST_USE_INSTRUMENTATION} "1") set(ENV{CTEST_USE_INSTRUMENTATION} "1")
set(ENV{CTEST_EXPERIMENTAL_INSTRUMENTATION} "a37d1069-1972-4901-b9c9-f194aaf2b6e0") set(ENV{CTEST_EXPERIMENTAL_INSTRUMENTATION} "d16a3082-c4e1-489b-b90c-55750a334f27")
set(RunCMake_USE_INSTRUMENTATION TRUE) set(RunCMake_USE_INSTRUMENTATION TRUE)
set(CASE_NAME InstrumentationInCTestXML) set(CASE_NAME InstrumentationInCTestXML)
else() 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) if(USE_INSTRUMENTATION)
set(CASE_CMAKELISTS_SUFFIX_CODE [[ set(CASE_CMAKELISTS_SUFFIX_CODE [[
add_subdirectory(MyThirdPartyDependency) add_subdirectory(MyThirdPartyDependency)
set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "a37d1069-1972-4901-b9c9-f194aaf2b6e0") set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "d16a3082-c4e1-489b-b90c-55750a334f27")
cmake_instrumentation(DATA_VERSION 1 API_VERSION 1) cmake_instrumentation(DATA_VERSION 1 API_VERSION 1)
]]) ]])
set(RunCMake-check-file CTestScriptVariableCommandLine-check.cmake) set(RunCMake-check-file CTestScriptVariableCommandLine-check.cmake)