From 3cd34eb279df8419dd849360cc3b2f1133d3f281 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 24 Feb 2023 15:00:32 -0500 Subject: [PATCH] Tests: Rename RunCMake.{ArtifactOutputDirs => TargetArtifacts} Generalize the name so we can add other kinds of artifact checks. --- Tests/RunCMake/CMakeLists.txt | 3 +-- .../{ArtifactOutputDirs => TargetArtifacts}/CMakeLists.txt | 0 .../OutputDirs.cmake} | 0 .../{ArtifactOutputDirs => TargetArtifacts}/RunCMakeTest.cmake | 2 +- .../{ArtifactOutputDirs => TargetArtifacts}/check.cmake | 0 Tests/RunCMake/{ArtifactOutputDirs => TargetArtifacts}/lib.c | 0 Tests/RunCMake/{ArtifactOutputDirs => TargetArtifacts}/main.c | 0 7 files changed, 2 insertions(+), 3 deletions(-) rename Tests/RunCMake/{ArtifactOutputDirs => TargetArtifacts}/CMakeLists.txt (100%) rename Tests/RunCMake/{ArtifactOutputDirs/ArtifactOutputDirs.cmake => TargetArtifacts/OutputDirs.cmake} (100%) rename Tests/RunCMake/{ArtifactOutputDirs => TargetArtifacts}/RunCMakeTest.cmake (92%) rename Tests/RunCMake/{ArtifactOutputDirs => TargetArtifacts}/check.cmake (100%) rename Tests/RunCMake/{ArtifactOutputDirs => TargetArtifacts}/lib.c (100%) rename Tests/RunCMake/{ArtifactOutputDirs => TargetArtifacts}/main.c (100%) diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index e3722867a4..7ec99853dc 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -270,8 +270,6 @@ if(want_NoQt_test) add_RunCMake_test(AutogenNoQt TEST_DIR Autogen) endif() -add_RunCMake_test(ArtifactOutputDirs) - if(NOT DEFINED CMake_TEST_BuildDepends_GNU_AS AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "LCC") AND CMAKE_GENERATOR MATCHES "^Ninja" @@ -396,6 +394,7 @@ if(UNIX AND CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG AND CMAKE_EXECUTABLE_FORMAT STRE endif() add_RunCMake_test(ScriptMode) add_RunCMake_test(Swift -DCMAKE_Swift_COMPILER=${CMAKE_Swift_COMPILER} -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}) +add_RunCMake_test(TargetArtifacts) add_RunCMake_test(TargetObjects) add_RunCMake_test(TargetProperties) add_RunCMake_test(ToolchainFile) diff --git a/Tests/RunCMake/ArtifactOutputDirs/CMakeLists.txt b/Tests/RunCMake/TargetArtifacts/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/ArtifactOutputDirs/CMakeLists.txt rename to Tests/RunCMake/TargetArtifacts/CMakeLists.txt diff --git a/Tests/RunCMake/ArtifactOutputDirs/ArtifactOutputDirs.cmake b/Tests/RunCMake/TargetArtifacts/OutputDirs.cmake similarity index 100% rename from Tests/RunCMake/ArtifactOutputDirs/ArtifactOutputDirs.cmake rename to Tests/RunCMake/TargetArtifacts/OutputDirs.cmake diff --git a/Tests/RunCMake/ArtifactOutputDirs/RunCMakeTest.cmake b/Tests/RunCMake/TargetArtifacts/RunCMakeTest.cmake similarity index 92% rename from Tests/RunCMake/ArtifactOutputDirs/RunCMakeTest.cmake rename to Tests/RunCMake/TargetArtifacts/RunCMakeTest.cmake index 1bf84380d0..54510b0332 100644 --- a/Tests/RunCMake/ArtifactOutputDirs/RunCMakeTest.cmake +++ b/Tests/RunCMake/TargetArtifacts/RunCMakeTest.cmake @@ -16,4 +16,4 @@ function(run_cmake_and_verify_after_build case) unset(RunCMake_TEST_BINARY_DIR) endfunction() -run_cmake_and_verify_after_build(ArtifactOutputDirs) +run_cmake_and_verify_after_build(OutputDirs) diff --git a/Tests/RunCMake/ArtifactOutputDirs/check.cmake b/Tests/RunCMake/TargetArtifacts/check.cmake similarity index 100% rename from Tests/RunCMake/ArtifactOutputDirs/check.cmake rename to Tests/RunCMake/TargetArtifacts/check.cmake diff --git a/Tests/RunCMake/ArtifactOutputDirs/lib.c b/Tests/RunCMake/TargetArtifacts/lib.c similarity index 100% rename from Tests/RunCMake/ArtifactOutputDirs/lib.c rename to Tests/RunCMake/TargetArtifacts/lib.c diff --git a/Tests/RunCMake/ArtifactOutputDirs/main.c b/Tests/RunCMake/TargetArtifacts/main.c similarity index 100% rename from Tests/RunCMake/ArtifactOutputDirs/main.c rename to Tests/RunCMake/TargetArtifacts/main.c