浏览代码

Experimental: Update the Instrumentation UUID

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.
Martin Duffy 4 周之前
父节点
当前提交
b8014633dc

+ 4 - 4
Help/dev/experimental.rst

@@ -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 ``2555e60c-9119-46fb-af73-8c54e9b6b326``.
+* value ``ec7aa2dc-b87f-45a3-8022-fe01c5f59984``.
 
 
 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-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),
 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=2555e60c-9119-46fb-af73-8c54e9b6b326``
+* ``CTEST_EXPERIMENTAL_INSTRUMENTATION=ec7aa2dc-b87f-45a3-8022-fe01c5f59984``

+ 1 - 1
Source/cmExperimental.cxx

@@ -65,7 +65,7 @@ cmExperimental::FeatureData const LookupTable[] = {
     cmExperimental::TryCompileCondition::Never },
     cmExperimental::TryCompileCondition::Never },
   // Instrumentation
   // Instrumentation
   { "Instrumentation",
   { "Instrumentation",
-    "2555e60c-9119-46fb-af73-8c54e9b6b326",
+    "ec7aa2dc-b87f-45a3-8022-fe01c5f59984",
     "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.",

+ 1 - 1
Tests/RunCMake/ConfigDir/check-reply.cmake

@@ -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-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")
   set(RunCMake_TEST_FAILED "Failed to read Instrumentation query from user config directory")
 endif()
 endif()

+ 0 - 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


+ 1 - 1
Tests/RunCMake/Instrumentation/RunCMakeTest.cmake

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

+ 1 - 1
Tests/RunCMake/Instrumentation/project/CMakeLists.txt

@@ -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 "2555e60c-9119-46fb-af73-8c54e9b6b326")
+  set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "ec7aa2dc-b87f-45a3-8022-fe01c5f59984")
   include(${INSTRUMENT_COMMAND_FILE})
   include(${INSTRUMENT_COMMAND_FILE})
 endif()
 endif()
 
 

+ 1 - 1
Tests/RunCMake/ctest_instrumentation/CMakeLists.txt.in

@@ -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 "2555e60c-9119-46fb-af73-8c54e9b6b326")
+  set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "ec7aa2dc-b87f-45a3-8022-fe01c5f59984")
 endif()
 endif()
 include(CTest)
 include(CTest)
 add_executable(main main.c)
 add_executable(main main.c)

+ 1 - 1
Tests/RunCMake/ctest_instrumentation/InstrumentationInCTestXML-check.cmake

@@ -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)
 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})

+ 1 - 1
Tests/RunCMake/ctest_instrumentation/RunCMakeTest.cmake

@@ -10,7 +10,7 @@ function(run_InstrumentationInCTestXML CASE_NAME)
     set(RunCMake_USE_VERBOSE_INSTRUMENTATION FALSE)
     set(RunCMake_USE_VERBOSE_INSTRUMENTATION FALSE)
   endif()
   endif()
   if(ARGS_USE_INSTRUMENTATION_ENV_VARS)
   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(ENV{CTEST_USE_INSTRUMENTATION} "1")
     set(RunCMake_USE_INSTRUMENTATION TRUE)
     set(RunCMake_USE_INSTRUMENTATION TRUE)
   else()
   else()

+ 1 - 1
Tests/RunCMake/ctest_labels_for_subprojects/RunCMakeTest.cmake

@@ -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 "2555e60c-9119-46fb-af73-8c54e9b6b326")
+  set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "ec7aa2dc-b87f-45a3-8022-fe01c5f59984")
   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)