Merge topic 'tests-split-ninjamc' into release-4.4

f880286604 Tests/NinjaMultiConfig: Split into three variants

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12344

Tests/RunCMake/CMakeLists.txt

@@ -270,9 +270,17 @@ if(CMAKE_GENERATOR MATCHES "Ninja")
   if(DEFINED CMake_TEST_CUDA)
     list(APPEND NinjaMultiConfig_ARGS -DCMake_TEST_CUDA=${CMake_TEST_CUDA})
   endif()
-  add_RunCMake_test(NinjaMultiConfig)
-  set_property(TEST RunCMake.NinjaMultiConfig APPEND
-    PROPERTY LABELS "CUDA")
+  function(add_RunCMake_NinjaMultiConfig_test variant)
+    add_RunCMake_test(NinjaMultiConfig${variant}
+      TEST_DIR NinjaMultiConfig
+      ${NinjaMultiConfig_ARGS}
+      -DCMake_TEST_NinjaMultiConfig_VARIANT=${variant})
+    set_property(TEST RunCMake.NinjaMultiConfig${variant} APPEND
+      PROPERTY LABELS "CUDA" "NinjaMultiConfig")
+  endfunction()
+  add_RunCMake_NinjaMultiConfig_test(Simple)
+  add_RunCMake_NinjaMultiConfig_test(CustomCommands)
+  add_RunCMake_NinjaMultiConfig_test("")
   add_RunCMake_test(NinjaPrivateDeps
     -DCMAKE_C_OUTPUT_EXTENSION=${CMAKE_C_OUTPUT_EXTENSION}
     -DRunCMake_GENERATOR_IS_MULTI_CONFIG=${_isMultiConfig})

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_dbg-debug-in-release-graph-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Release[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Release[\/]echo(\.exe)?
 \[3/3\] Generating echo_dbg_Debug\.txt
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Debug' 'echo_dbg_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Debug' 'echo_dbg_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_dbg-debug-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Debug[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Debug[\/]echo(\.exe)?
 \[3/3\] Generating echo_dbg_Debug\.txt
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_dbg_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_dbg_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_dbgx-debug-in-release-graph-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Release[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Release[\/]echo(\.exe)?
 \[3/3\] Generating echo_dbgx_Debug\.txt
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Debug' 'echo_dbgx_Debug\.txt' 'echo_dbgx_byproduct_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Debug' 'echo_dbgx_Debug\.txt' 'echo_dbgx_byproduct_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_dbgx-debug-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Debug[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Debug[\/]echo(\.exe)?
 \[3/3\] Generating echo_dbgx_Debug\.txt
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_dbgx_Debug\.txt' 'echo_dbgx_byproduct_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_dbgx_Debug\.txt' 'echo_dbgx_byproduct_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_dbgx-release-ninja-stdout.txt

@@ -2,4 +2,4 @@
 \[2/3\] Linking C executable Release[\/]echo(\.exe)?
 \[3/3\] [^
 ]*
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Release' 'echo_dbgx_byproduct_Release\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Release' 'echo_dbgx_byproduct_Release\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_depend_target-debug-in-release-graph-ninja-stdout.txt

@@ -1,2 +1,2 @@
 ^\[1/1\] Generating echo_depend_target\.txt
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Release'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Release'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_depend_target-debug-ninja-stdout.txt

@@ -1,2 +1,2 @@
 ^\[1/1\] Generating echo_depend_target\.txt
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_depend_target-release-ninja-stdout.txt

@@ -1,2 +1,2 @@
 ^\[1/1\] Generating echo_depend_target\.txt
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Release'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Release'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_genex-debug-in-release-graph-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Release[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Release[\/]echo(\.exe)?
 \[3/3\] Generating echo_genex_Debug\.txt
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Release' 'echo_genex_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Release' 'echo_genex_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_genex-debug-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Debug[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Debug[\/]echo(\.exe)?
 \[3/3\] Generating echo_genex_Debug\.txt
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_genex_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_genex_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_genex_out-debug-in-release-graph-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Debug[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Debug[\/]echo(\.exe)?
 \[3/3\] Generating echo_genex_out_Debug\.txt
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Release'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_genex_out_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Release'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_genex_out_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_genex_out-debug-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Debug[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Debug[\/]echo(\.exe)?
 \[3/3\] Generating echo_genex_out_Debug\.txt
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_genex_out_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_genex_out_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_no_cross_byproduct-debug-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Debug[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Debug[\/]echo(\.exe)?
 \[3/3\] Generating echo_no_cross_byproduct_Debug\.txt
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_no_cross_byproduct_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_no_cross_byproduct_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_no_cross_byproduct_if-debug-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Debug[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Debug[\/]echo(\.exe)?
 \[3/3\] Generating echo_no_cross_byproduct_if_Debug\.txt
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_no_cross_byproduct_if_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_no_cross_byproduct_if_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_no_cross_output-debug-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Debug[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Debug[\/]echo(\.exe)?
 \[3/3\] Generating echo_no_cross_output\.txt, echo_no_cross_output_Debug\.txt
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_no_cross_output_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_no_cross_output_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_no_cross_output_if-debug-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Debug[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Debug[\/]echo(\.exe)?
 \[3/3\] Generating echo_no_cross_output_a\.txt, echo_no_cross_output_if_Debug\.txt
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_no_cross_output_if_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_no_cross_output_if_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_raw-debug-in-release-graph-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Release[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Release[\/]echo(\.exe)?
 \[3/3\] Generating echo_raw_Debug\.txt
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Debug' 'echo_raw_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Debug' 'echo_raw_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_raw-debug-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Debug[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Debug[\/]echo(\.exe)?
 \[3/3\] Generating echo_raw_Debug\.txt
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_raw_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_raw_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_target_genex-debug-in-release-graph-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Release[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Release[\/]echo(\.exe)?
 \[3/3\] echo_target_genex
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Release' 'echo_target_genex_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Release' 'echo_target_genex_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_target_genex-debug-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Debug[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Debug[\/]echo(\.exe)?
 \[3/3\] echo_target_genex
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_target_genex_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_target_genex_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_target_genex_out-debug-in-release-graph-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Debug[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Debug[\/]echo(\.exe)?
 \[3/3\] echo_target_genex_out
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Release'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_target_genex_out_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Release'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_target_genex_out_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_target_genex_out-debug-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Debug[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Debug[\/]echo(\.exe)?
 \[3/3\] echo_target_genex_out
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_target_genex_out_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_target_genex_out_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_target_raw-debug-in-release-graph-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Release[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Release[\/]echo(\.exe)?
 \[3/3\] echo_target_raw
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Debug' 'echo_target_raw_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Debug' 'echo_target_raw_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-echo_target_raw-debug-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Debug[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Debug[\/]echo(\.exe)?
 \[3/3\] echo_target_raw
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_target_raw_Debug\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'echo_target_raw_Debug\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-target_no_cross_byproduct-debug-in-release-graph-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Release[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Release[\/]echo(\.exe)?
 \[3/3\] target_no_cross_byproduct
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Release'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Release' 'target_no_cross_byproduct\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Release'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Release[\/]echo(\.exe)?' 'Release' 'target_no_cross_byproduct\.txt'$

Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-target_no_cross_byproduct-debug-ninja-stdout.txt

@@ -1,4 +1,4 @@
 ^\[1/3\] Building C object CMakeFiles[\/]echo\.dir[\/]Debug[\/]echo\.c\.(o|obj)
 \[2/3\] Linking C executable Debug[\/]echo(\.exe)?
 \[3/3\] target_no_cross_byproduct
-'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfig[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'target_no_cross_byproduct\.txt'$
+'[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug'\$ '[^']*[\/]Tests[\/]RunCMake[\/]NinjaMultiConfigCustomCommands[\/]CustomCommandOutputGenex-build[\/]Debug[\/]echo(\.exe)?' 'Debug' 'target_no_cross_byproduct\.txt'$

Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake

@@ -81,6 +81,8 @@ endfunction()
 
 ###############################################################################
 
+if(CMake_TEST_NinjaMultiConfig_VARIANT STREQUAL "Simple")
+
 set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/Simple-build)
 # IMPORTANT: Setting RelWithDebInfo as the first item in CMAKE_CONFIGURATION_TYPES
 # generates a build.ninja file with that configuration
@@ -194,6 +196,8 @@ run_ninja(SimpleCrossConfigs clean-all-in-release-graph build-Release.ninja clea
 run_cmake_build(SimpleCrossConfigs all-all-in-release-graph Release all:all)
 run_cmake_build(SimpleCrossConfigs all-relwithdebinfo-in-release-graph Release all:RelWithDebInfo)
 
+elseif(CMake_TEST_NinjaMultiConfig_VARIANT STREQUAL "CustomCommands")
+
 set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/PostBuild-build)
 set(RunCMake_TEST_OPTIONS "-DCMAKE_CROSS_CONFIGS=all")
 run_cmake_configure(PostBuild)
@@ -391,6 +395,8 @@ run_cmake(CustomCommandDepfile)
 run_cmake(CustomCommandDepfileAsOutput)
 run_cmake(CustomCommandDepfileAsByproduct)
 
+else()
+
 set(RunCMake_TEST_OPTIONS "-DCMAKE_CROSS_CONFIGS=all")
 run_cmake(PerConfigSources)
 unset(RunCMake_TEST_OPTIONS)
@@ -563,3 +569,4 @@ if(CMake_TEST_Qt_version)
     endforeach()
   endif()
 endif()
+endif()

Tests/RunCMake/NinjaMultiConfig/Simple-reconfigure-config-ninja-stdout.txt

@@ -1,4 +1,4 @@
 -- Configuring done \([0-9]+\.[0-9]s\)
 -- Generating done \([0-9]+\.[0-9]s\)
 -- Build files have been written to: [^
-]*/Tests/RunCMake/NinjaMultiConfig/Simple-build
+]*/Tests/RunCMake/NinjaMultiConfigSimple/Simple-build

Tests/RunCMake/NinjaMultiConfig/Simple-reconfigure-noconfig-ninja-stdout.txt

@@ -1,4 +1,4 @@
 -- Configuring done \([0-9]+\.[0-9]s\)
 -- Generating done \([0-9]+\.[0-9]s\)
 -- Build files have been written to: [^
-]*/Tests/RunCMake/NinjaMultiConfig/Simple-build
+]*/Tests/RunCMake/NinjaMultiConfigSimple/Simple-build