Tests: Match expected environment modification more completely

Tests/RunCMake/ExternalProject/EnvVars-build-stdout-windows.txt

@@ -0,0 +1,32 @@
+.*(Performing custom step for 'CustomCommand'|CustomCommand-custom).*
+ *-- Variable - CustomVar: custom.*
+ *-- Variable - CustomVar2: custom2.*
+ *-- Stage: custom
+ *-- Separator: ;
+ *-- List: 1;2;3
+.*(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 'CustomCommand'|CustomCommand-build).*
+ *-- Stage: build
+ *-- Separator: ;
+ *-- List: 4;5;6
+.*(Performing install step for 'CustomCommand'|CustomCommand-install).*
+ *-- Stage: install
+ *-- Separator: ;
+ *-- List: 4;5;6
+.*(Performing test step for 'CustomCommand'|CustomCommand-test).*
+ *-- Stage: test
+ *-- Separator: ;
+ *-- List: 4;5;6
+.*(Performing configure step for 'DefaultCommand'|DefaultCommand-configure).*
+ *-- ConfigVar: config
+ *-- Separator: ,
+ *-- List: 7,8,9
+.*(Performing build step for 'DefaultCommand'|DefaultCommand-build).*
+ *-- Stage: build
+ *-- Separator: ,
+ *-- List: 7,8,9,10

Tests/RunCMake/ExternalProject/EnvVars-build-stdout.txt

@@ -30,3 +30,15 @@
  *-- Stage: build
  *-- Separator: ,
  *-- List: 7,8,9,10
+.*(Performing configure step for 'DefaultCommandListSep'|DefaultCommandListSep-configure).*
+ *-- ConfigVar: config
+ *-- Separator: ;
+ *-- List: 10;11;12
+.*(Performing build step for 'DefaultCommandListSep'|DefaultCommandListSep-build).*
+ *-- Stage: build
+ *-- Separator: ;
+ *-- List: 10;11;12
+.*(Performing install step for 'DefaultCommandListSep'|DefaultCommandListSep-install).*
+ *-- Stage: install
+ *-- Separator: ;
+ *-- List: 10;11;12;13