mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-12 01:09:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Match expected environment modification more consistently

Browse Source 
Revert the regex change from commit 01147454e7 (FASTBuild: Add
generator, 2025-07-30) and revise the build output to match anyway.
The actual problem was that build and install steps are driven through
a nested `cmake --build`, and `fbuild` prefixes the first line of build
output.  Add an innocuous first line so we can match the intended lines
consistently across generators.
This commit is contained in:
Brad King
2025-10-12 10:23:56 -04:00
parent c555e10fd4
commit 819c6177b8
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/RunCMake/ExternalProject/EnvVars-build-stdout.txt
View File

@@ -27,6 +27,6 @@
*-- Separator: ,
*-- List: 7,8,9
.*(Performing build step for 'DefaultCommand'|DefaultCommand-build).*
.*-- Stage: build
*-- Stage: build
*-- Separator: ,
*-- List: 7,8,9,10

7
Tests/RunCMake/ExternalProject/EnvVars/CMakeLists.txt
View File

@@ -6,7 +6,10 @@ message(STATUS "${VARIABLE}: $ENV{${VARIABLE}}")
message(STATUS "Separator: $ENV{ListSeparator}")
message(STATUS "List: $ENV{ListVar}")
add_custom_target(EchoEnvVars ALL COMMAND
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_SOURCE_DIR}/EchoVar.cmake")
add_custom_target(EchoEnvVars ALL COMMENT "Build environment..."
COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_SOURCE_DIR}/EchoVar.cmake")
install(SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/EchoVar.cmake")
# Avoid repeating always-out-of-date EchoEnvVars during install step.
set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1)