Home Explore Help
Sign In
Apq
/
CMake
mirror of https://github.com/Kitware/CMake.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge topic 'nmc-test-fix'

e0a7c0d40d Tests: Fix one RunCMake.NinjaMultiConfig case name

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5447
Brad King 5 years ago
parent
23d379674b e0a7c0d40d
commit
7cef3fad02
2 changed files with 1 additions and 1 deletions
Split View Show Diff Stats
  1. 0 0
      Tests/RunCMake/NinjaMultiConfig/CustomCommandGenerator-debug-clean-again-ninja-check.cmake
  2. 1 1
      Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake

+ 0 - 0
Tests/RunCMake/NinjaMultiConfig/CustomCommandGenerator-debug-in-release-graph-clean-ninja-check.cmake → Tests/RunCMake/NinjaMultiConfig/CustomCommandGenerator-debug-clean-again-ninja-check.cmake
View File


+ 1 - 1
Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake
View File 

@@ -215,7 +215,7 @@ run_ninja(CustomCommandGenerator debug-clean build-Debug.ninja clean)
 
 run_cmake_build(CustomCommandGenerator release-clean Release clean)
 
 run_cmake_build(CustomCommandGenerator debug-in-release-graph Release generated:Debug)
 
 run_cmake_command(CustomCommandGenerator-debug-in-release-graph-generated "${TARGET_FILE_generated_Debug}")
 
-run_ninja(CustomCommandGenerator debug-in-release-graph-clean build-Debug.ninja clean:Debug)
 
+run_ninja(CustomCommandGenerator debug-clean-again build-Debug.ninja clean:Debug)
 
 run_ninja(CustomCommandGenerator release-in-debug-graph build-Debug.ninja generated:Release)
 
 run_cmake_command(CustomCommandGenerator-release-in-debug-graph-generated "${TARGET_FILE_generated_Release}")
 
 unset(RunCMake_TEST_NO_CLEAN)