From e0a7c0d40d7cec467e9247ce02e89638224c20e0 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 29 Oct 2020 10:52:40 -0400 Subject: Tests: Fix one RunCMake.NinjaMultiConfig case name The CustomCommandGenerator `debug-in-release-graph-clean` case actually cleans using the Debug graph. This is intentional in order to test cleaning only the Debug parts, so fix the test name rather than changing what graph it uses. --- ...ndGenerator-debug-clean-again-ninja-check.cmake | 35 ++++++++++++++++++++++ ...-debug-in-release-graph-clean-ninja-check.cmake | 35 ---------------------- Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake | 2 +- 3 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 Tests/RunCMake/NinjaMultiConfig/CustomCommandGenerator-debug-clean-again-ninja-check.cmake delete mode 100644 Tests/RunCMake/NinjaMultiConfig/CustomCommandGenerator-debug-in-release-graph-clean-ninja-check.cmake diff --git a/Tests/RunCMake/NinjaMultiConfig/CustomCommandGenerator-debug-clean-again-ninja-check.cmake b/Tests/RunCMake/NinjaMultiConfig/CustomCommandGenerator-debug-clean-again-ninja-check.cmake new file mode 100644 index 0000000..1e4cbe1 --- /dev/null +++ b/Tests/RunCMake/NinjaMultiConfig/CustomCommandGenerator-debug-clean-again-ninja-check.cmake @@ -0,0 +1,35 @@ +check_files("${RunCMake_TEST_BINARY_DIR}" + INCLUDE + ${CONFIG_FILES} + + ${TARGET_FILE_generator_Release} + ${TARGET_OBJECT_FILES_generator_Release} + + ${TARGET_FILE_generatorlib_Release} + ${TARGET_LINKER_FILE_generatorlib_Release} + ${TARGET_OBJECT_FILES_generatorlib_Release} + + ${TARGET_OBJECT_FILES_generatorobj_Release} + + EXCLUDE + ${TARGET_OBJECT_FILES_generator_Debug} + ${TARGET_OBJECT_FILES_generated_Debug} + ${TARGET_OBJECT_FILES_generatorlib_Debug} + ${TARGET_OBJECT_FILES_generatorobj_Debug} + ${TARGET_OBJECT_FILES_emptyobj_Debug} + + ${TARGET_OBJECT_FILES_generated_Release} + ${TARGET_OBJECT_FILES_emptyobj_Release} + + ${TARGET_OBJECT_FILES_generator_MinSizeRel} + ${TARGET_OBJECT_FILES_generated_MinSizeRel} + ${TARGET_OBJECT_FILES_generatorlib_MinSizeRel} + ${TARGET_OBJECT_FILES_generatorobj_MinSizeRel} + ${TARGET_OBJECT_FILES_emptyobj_MinSizeRel} + + ${TARGET_OBJECT_FILES_generator_RelWithDebInfo} + ${TARGET_OBJECT_FILES_generated_RelWithDebInfo} + ${TARGET_OBJECT_FILES_generatorlib_RelWithDebInfo} + ${TARGET_OBJECT_FILES_generatorobj_RelWithDebInfo} + ${TARGET_OBJECT_FILES_emptyobj_RelWithDebInfo} + ) diff --git a/Tests/RunCMake/NinjaMultiConfig/CustomCommandGenerator-debug-in-release-graph-clean-ninja-check.cmake b/Tests/RunCMake/NinjaMultiConfig/CustomCommandGenerator-debug-in-release-graph-clean-ninja-check.cmake deleted file mode 100644 index 1e4cbe1..0000000 --- a/Tests/RunCMake/NinjaMultiConfig/CustomCommandGenerator-debug-in-release-graph-clean-ninja-check.cmake +++ /dev/null @@ -1,35 +0,0 @@ -check_files("${RunCMake_TEST_BINARY_DIR}" - INCLUDE - ${CONFIG_FILES} - - ${TARGET_FILE_generator_Release} - ${TARGET_OBJECT_FILES_generator_Release} - - ${TARGET_FILE_generatorlib_Release} - ${TARGET_LINKER_FILE_generatorlib_Release} - ${TARGET_OBJECT_FILES_generatorlib_Release} - - ${TARGET_OBJECT_FILES_generatorobj_Release} - - EXCLUDE - ${TARGET_OBJECT_FILES_generator_Debug} - ${TARGET_OBJECT_FILES_generated_Debug} - ${TARGET_OBJECT_FILES_generatorlib_Debug} - ${TARGET_OBJECT_FILES_generatorobj_Debug} - ${TARGET_OBJECT_FILES_emptyobj_Debug} - - ${TARGET_OBJECT_FILES_generated_Release} - ${TARGET_OBJECT_FILES_emptyobj_Release} - - ${TARGET_OBJECT_FILES_generator_MinSizeRel} - ${TARGET_OBJECT_FILES_generated_MinSizeRel} - ${TARGET_OBJECT_FILES_generatorlib_MinSizeRel} - ${TARGET_OBJECT_FILES_generatorobj_MinSizeRel} - ${TARGET_OBJECT_FILES_emptyobj_MinSizeRel} - - ${TARGET_OBJECT_FILES_generator_RelWithDebInfo} - ${TARGET_OBJECT_FILES_generated_RelWithDebInfo} - ${TARGET_OBJECT_FILES_generatorlib_RelWithDebInfo} - ${TARGET_OBJECT_FILES_generatorobj_RelWithDebInfo} - ${TARGET_OBJECT_FILES_emptyobj_RelWithDebInfo} - ) diff --git a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake index 6699a09..2411114 100644 --- a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake +++ b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake @@ -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) -- cgit v0.12