From c555e10fd4e6d06bd49eae61b172d357807d96e5 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 9 Oct 2025 18:55:16 -0400 Subject: [PATCH] Tests: Use shorter paths in RunCMake.ExternalProject --- .../ExternalProject/EnvVars-build-stdout.txt | 14 +++++++------- Tests/RunCMake/ExternalProject/EnvVars.cmake | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Tests/RunCMake/ExternalProject/EnvVars-build-stdout.txt b/Tests/RunCMake/ExternalProject/EnvVars-build-stdout.txt index 59a30fec2f..91910b8a66 100644 --- a/Tests/RunCMake/ExternalProject/EnvVars-build-stdout.txt +++ b/Tests/RunCMake/ExternalProject/EnvVars-build-stdout.txt @@ -1,32 +1,32 @@ -.*(Performing custom step for 'CustomCommandEnvVars'|CustomCommandEnvVars-custom).* +.*(Performing custom step for 'CustomCommand'|CustomCommand-custom).* *-- Variable - CustomVar: custom.* *-- Variable - CustomVar2: custom2.* *-- Stage: custom *-- Separator: ; *-- List: 1;2;3 -.*(Performing configure step for 'CustomCommandEnvVars'|CustomCommandEnvVars-configure).* +.*(Performing configure step for 'CustomCommand'|CustomCommand-configure).* *-- Stage: config *-- Separator: ; *-- List: 4;5;6.* *-- Variable - Stage: config.* *-- Variable - ListVar: 4;5;6 -.*(Performing build step for 'CustomCommandEnvVars'|CustomCommandEnvVars-build).* +.*(Performing build step for 'CustomCommand'|CustomCommand-build).* *-- Stage: build *-- Separator: ; *-- List: 4;5;6 -.*(Performing install step for 'CustomCommandEnvVars'|CustomCommandEnvVars-install).* +.*(Performing install step for 'CustomCommand'|CustomCommand-install).* *-- Stage: install *-- Separator: ; *-- List: 4;5;6 -.*(Performing test step for 'CustomCommandEnvVars'|CustomCommandEnvVars-test).* +.*(Performing test step for 'CustomCommand'|CustomCommand-test).* *-- Stage: test *-- Separator: ; *-- List: 4;5;6 -.*(Performing configure step for 'DefaultCommandEnvVars'|DefaultCommandEnvVars-configure).* +.*(Performing configure step for 'DefaultCommand'|DefaultCommand-configure).* *-- ConfigVar: config *-- Separator: , *-- List: 7,8,9 -.*(Performing build step for 'DefaultCommandEnvVars'|DefaultCommandEnvVars-build).* +.*(Performing build step for 'DefaultCommand'|DefaultCommand-build).* .*-- Stage: build *-- Separator: , *-- List: 7,8,9,10 diff --git a/Tests/RunCMake/ExternalProject/EnvVars.cmake b/Tests/RunCMake/ExternalProject/EnvVars.cmake index 23994d9a53..924224e754 100644 --- a/Tests/RunCMake/ExternalProject/EnvVars.cmake +++ b/Tests/RunCMake/ExternalProject/EnvVars.cmake @@ -6,7 +6,7 @@ include(ExternalProject) # Comma list-separator set(ScriptPath "${CMAKE_CURRENT_SOURCE_DIR}/EnvVars/EchoVar.cmake") -ExternalProject_Add(CustomCommandEnvVars +ExternalProject_Add(CustomCommand DOWNLOAD_COMMAND "" UPDATE_COMMAND "" PATCH_COMMAND "" @@ -37,7 +37,7 @@ ExternalProject_Add(CustomCommandEnvVars ListVar=set:4,5,6 ListSeparator=set:,) -ExternalProject_Add_Step(CustomCommandEnvVars custom +ExternalProject_Add_Step(CustomCommand custom DEPENDERS configure COMMAND "${CMAKE_COMMAND}" -DVARNAME=CustomVar -P ${ScriptPath} COMMAND "${CMAKE_COMMAND}" -DVARNAME=CustomVar2 -P ${ScriptPath} @@ -54,12 +54,12 @@ ExternalProject_Add_Step(CustomCommandEnvVars custom # # No list separator -ExternalProject_Add(DefaultCommandEnvVars +ExternalProject_Add(DefaultCommand SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/EnvVars" DOWNLOAD_COMMAND "" UPDATE_COMMAND "" PATCH_COMMAND "" - DEPENDS CustomCommandEnvVars + DEPENDS CustomCommand CMAKE_ARGS -DVARIABLE=ConfigVar CONFIGURE_ENVIRONMENT_MODIFICATION @@ -80,12 +80,12 @@ ExternalProject_Add(DefaultCommandEnvVars if(NOT WIN32) # Ensure that using `:` as a list-separator does not break setting environment # variables - ExternalProject_Add(DefaultCommandListSepEnvVars + ExternalProject_Add(DefaultCommandListSep SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/EnvVars" DOWNLOAD_COMMAND "" UPDATE_COMMAND "" PATCH_COMMAND "" - DEPENDS DefaultCommandEnvVars + DEPENDS DefaultCommand LIST_SEPARATOR : CMAKE_ARGS -DVARIABLE=ConfigVar