From 6308bfb73777a7231928509ce651b45dfb6aa657 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 15 Jun 2020 14:45:01 -0400 Subject: [PATCH] Tests: Factor out RunCMake.GenEx-GENEX_EVAL test Move the `GENEX_EVAL` cases and friends out of `RunCMake.GeneratorExpression`. --- Tests/RunCMake/CMakeLists.txt | 1 + Tests/RunCMake/GenEx-GENEX_EVAL/CMakeLists.txt | 3 +++ .../GENEX_EVAL-check.cmake | 0 .../GENEX_EVAL-recursion1-result.txt | 0 .../GENEX_EVAL-recursion1-stderr.txt | 0 .../GENEX_EVAL-recursion1.cmake | 0 .../GENEX_EVAL-recursion2-result.txt | 0 .../GENEX_EVAL-recursion2-stderr.txt | 0 .../GENEX_EVAL-recursion2.cmake | 0 .../GENEX_EVAL.cmake | 0 Tests/RunCMake/GenEx-GENEX_EVAL/RunCMakeTest.cmake | 11 +++++++++++ .../TARGET_GENEX_EVAL-check.cmake | 0 .../TARGET_GENEX_EVAL-no-arg-result.txt | 0 .../TARGET_GENEX_EVAL-no-arg-stderr.txt | 0 .../TARGET_GENEX_EVAL-no-arg.cmake | 0 .../TARGET_GENEX_EVAL-no-target-result.txt | 0 .../TARGET_GENEX_EVAL-no-target-stderr.txt | 0 .../TARGET_GENEX_EVAL-no-target.cmake | 0 .../TARGET_GENEX_EVAL-non-valid-target-result.txt | 0 .../TARGET_GENEX_EVAL-non-valid-target-stderr.txt | 0 .../TARGET_GENEX_EVAL-non-valid-target.cmake | 0 .../TARGET_GENEX_EVAL-recursion1-result.txt | 0 .../TARGET_GENEX_EVAL-recursion1-stderr.txt | 0 .../TARGET_GENEX_EVAL-recursion1.cmake | 0 .../TARGET_GENEX_EVAL-recursion2-result.txt | 0 .../TARGET_GENEX_EVAL-recursion2-stderr.txt | 0 .../TARGET_GENEX_EVAL-recursion2.cmake | 0 .../TARGET_GENEX_EVAL.cmake | 0 Tests/RunCMake/GenEx-GENEX_EVAL/empty.c | 0 Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake | 9 --------- 30 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 Tests/RunCMake/GenEx-GENEX_EVAL/CMakeLists.txt rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/GENEX_EVAL-check.cmake (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/GENEX_EVAL-recursion1-result.txt (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/GENEX_EVAL-recursion1-stderr.txt (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/GENEX_EVAL-recursion1.cmake (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/GENEX_EVAL-recursion2-result.txt (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/GENEX_EVAL-recursion2-stderr.txt (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/GENEX_EVAL-recursion2.cmake (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/GENEX_EVAL.cmake (100%) create mode 100644 Tests/RunCMake/GenEx-GENEX_EVAL/RunCMakeTest.cmake rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/TARGET_GENEX_EVAL-check.cmake (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/TARGET_GENEX_EVAL-no-arg-result.txt (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/TARGET_GENEX_EVAL-no-arg-stderr.txt (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/TARGET_GENEX_EVAL-no-arg.cmake (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/TARGET_GENEX_EVAL-no-target-result.txt (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/TARGET_GENEX_EVAL-no-target-stderr.txt (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/TARGET_GENEX_EVAL-no-target.cmake (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/TARGET_GENEX_EVAL-non-valid-target-result.txt (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/TARGET_GENEX_EVAL-non-valid-target-stderr.txt (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/TARGET_GENEX_EVAL-non-valid-target.cmake (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/TARGET_GENEX_EVAL-recursion1-result.txt (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/TARGET_GENEX_EVAL-recursion1-stderr.txt (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/TARGET_GENEX_EVAL-recursion1.cmake (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/TARGET_GENEX_EVAL-recursion2-result.txt (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/TARGET_GENEX_EVAL-recursion2-stderr.txt (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/TARGET_GENEX_EVAL-recursion2.cmake (100%) rename Tests/RunCMake/{GeneratorExpression => GenEx-GENEX_EVAL}/TARGET_GENEX_EVAL.cmake (100%) create mode 100644 Tests/RunCMake/GenEx-GENEX_EVAL/empty.c diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 163bdf790e..58a859fef0 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -228,6 +228,7 @@ add_RunCMake_test(GenEx-LINK_LANG_AND_ID) add_RunCMake_test(GenEx-HOST_LINK) add_RunCMake_test(GenEx-DEVICE_LINK) add_RunCMake_test(GenEx-TARGET_FILE -DLINKER_SUPPORTS_PDB=${LINKER_SUPPORTS_PDB}) +add_RunCMake_test(GenEx-GENEX_EVAL) add_RunCMake_test(GeneratorExpression) add_RunCMake_test(GeneratorInstance) add_RunCMake_test(GeneratorPlatform) diff --git a/Tests/RunCMake/GenEx-GENEX_EVAL/CMakeLists.txt b/Tests/RunCMake/GenEx-GENEX_EVAL/CMakeLists.txt new file mode 100644 index 0000000000..44025d3bd1 --- /dev/null +++ b/Tests/RunCMake/GenEx-GENEX_EVAL/CMakeLists.txt @@ -0,0 +1,3 @@ +cmake_minimum_required(VERSION 3.12) +project(${RunCMake_TEST} NONE) +include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-check.cmake b/Tests/RunCMake/GenEx-GENEX_EVAL/GENEX_EVAL-check.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/GENEX_EVAL-check.cmake rename to Tests/RunCMake/GenEx-GENEX_EVAL/GENEX_EVAL-check.cmake diff --git a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion1-result.txt b/Tests/RunCMake/GenEx-GENEX_EVAL/GENEX_EVAL-recursion1-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion1-result.txt rename to Tests/RunCMake/GenEx-GENEX_EVAL/GENEX_EVAL-recursion1-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion1-stderr.txt b/Tests/RunCMake/GenEx-GENEX_EVAL/GENEX_EVAL-recursion1-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion1-stderr.txt rename to Tests/RunCMake/GenEx-GENEX_EVAL/GENEX_EVAL-recursion1-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion1.cmake b/Tests/RunCMake/GenEx-GENEX_EVAL/GENEX_EVAL-recursion1.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion1.cmake rename to Tests/RunCMake/GenEx-GENEX_EVAL/GENEX_EVAL-recursion1.cmake diff --git a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion2-result.txt b/Tests/RunCMake/GenEx-GENEX_EVAL/GENEX_EVAL-recursion2-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion2-result.txt rename to Tests/RunCMake/GenEx-GENEX_EVAL/GENEX_EVAL-recursion2-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion2-stderr.txt b/Tests/RunCMake/GenEx-GENEX_EVAL/GENEX_EVAL-recursion2-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion2-stderr.txt rename to Tests/RunCMake/GenEx-GENEX_EVAL/GENEX_EVAL-recursion2-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion2.cmake b/Tests/RunCMake/GenEx-GENEX_EVAL/GENEX_EVAL-recursion2.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion2.cmake rename to Tests/RunCMake/GenEx-GENEX_EVAL/GENEX_EVAL-recursion2.cmake diff --git a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL.cmake b/Tests/RunCMake/GenEx-GENEX_EVAL/GENEX_EVAL.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/GENEX_EVAL.cmake rename to Tests/RunCMake/GenEx-GENEX_EVAL/GENEX_EVAL.cmake diff --git a/Tests/RunCMake/GenEx-GENEX_EVAL/RunCMakeTest.cmake b/Tests/RunCMake/GenEx-GENEX_EVAL/RunCMakeTest.cmake new file mode 100644 index 0000000000..d804a56460 --- /dev/null +++ b/Tests/RunCMake/GenEx-GENEX_EVAL/RunCMakeTest.cmake @@ -0,0 +1,11 @@ +include(RunCMake) + +run_cmake(TARGET_GENEX_EVAL-no-arg) +run_cmake(TARGET_GENEX_EVAL-no-target) +run_cmake(TARGET_GENEX_EVAL-non-valid-target) +run_cmake(TARGET_GENEX_EVAL-recursion1) +run_cmake(TARGET_GENEX_EVAL-recursion2) +run_cmake(TARGET_GENEX_EVAL) +run_cmake(GENEX_EVAL-recursion1) +run_cmake(GENEX_EVAL-recursion2) +run_cmake(GENEX_EVAL) diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-check.cmake b/Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-check.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-check.cmake rename to Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-check.cmake diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-arg-result.txt b/Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-no-arg-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-arg-result.txt rename to Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-no-arg-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-arg-stderr.txt b/Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-no-arg-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-arg-stderr.txt rename to Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-no-arg-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-arg.cmake b/Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-no-arg.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-arg.cmake rename to Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-no-arg.cmake diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-target-result.txt b/Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-no-target-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-target-result.txt rename to Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-no-target-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-target-stderr.txt b/Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-no-target-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-target-stderr.txt rename to Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-no-target-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-target.cmake b/Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-no-target.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-target.cmake rename to Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-no-target.cmake diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-non-valid-target-result.txt b/Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-non-valid-target-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-non-valid-target-result.txt rename to Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-non-valid-target-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-non-valid-target-stderr.txt b/Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-non-valid-target-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-non-valid-target-stderr.txt rename to Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-non-valid-target-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-non-valid-target.cmake b/Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-non-valid-target.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-non-valid-target.cmake rename to Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-non-valid-target.cmake diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion1-result.txt b/Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-recursion1-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion1-result.txt rename to Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-recursion1-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion1-stderr.txt b/Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-recursion1-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion1-stderr.txt rename to Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-recursion1-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion1.cmake b/Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-recursion1.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion1.cmake rename to Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-recursion1.cmake diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion2-result.txt b/Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-recursion2-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion2-result.txt rename to Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-recursion2-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion2-stderr.txt b/Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-recursion2-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion2-stderr.txt rename to Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-recursion2-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion2.cmake b/Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-recursion2.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion2.cmake rename to Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL-recursion2.cmake diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL.cmake b/Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL.cmake rename to Tests/RunCMake/GenEx-GENEX_EVAL/TARGET_GENEX_EVAL.cmake diff --git a/Tests/RunCMake/GenEx-GENEX_EVAL/empty.c b/Tests/RunCMake/GenEx-GENEX_EVAL/empty.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake index 927005ed52..0278cf6591 100644 --- a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake +++ b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake @@ -34,15 +34,6 @@ run_cmake(TARGET_NAME_IF_EXISTS-no-arg) run_cmake(TARGET_NAME_IF_EXISTS-empty-arg) run_cmake(TARGET_NAME_IF_EXISTS) run_cmake(TARGET_NAME_IF_EXISTS-not-a-target) -run_cmake(TARGET_GENEX_EVAL-no-arg) -run_cmake(TARGET_GENEX_EVAL-no-target) -run_cmake(TARGET_GENEX_EVAL-non-valid-target) -run_cmake(TARGET_GENEX_EVAL-recursion1) -run_cmake(TARGET_GENEX_EVAL-recursion2) -run_cmake(TARGET_GENEX_EVAL) -run_cmake(GENEX_EVAL-recursion1) -run_cmake(GENEX_EVAL-recursion2) -run_cmake(GENEX_EVAL) run_cmake(REMOVE_DUPLICATES-empty) run_cmake(REMOVE_DUPLICATES-1) run_cmake(REMOVE_DUPLICATES-2)