[llvm] cbab695 - [llvm][test] Small fixes around CGTestPlugin (NFC) (#225362)

[via llvm-commits]

Author: Stefan Gränitz
Date: 2026-09-22T14:03:47Z
New Revision: cbab69595ca6f5a1c7296985e5555b8b45a35e55

URL: https://github.com/llvm/llvm-project/commit/cbab69595ca6f5a1c7296985e5555b8b45a35e55
DIFF: https://github.com/llvm/llvm-project/commit/cbab69595ca6f5a1c7296985e5555b8b45a35e55.diff

LOG: [llvm][test] Small fixes around CGTestPlugin (NFC) (#225362)

We use `LLVM_ENABLE_PLUGINS` as condition to run the unit-tests in
CGPluginTest, but we used to built the required plugin under `NOT WIN32
AND NOT CYGWIN`. These only happened to be equivalent. This patch guards
the entire folder under `LLVM_ENABLE_PLUGINS`. It also moves the related
LIT test to Feature/codegen-plugin-legacy.ll and adds REQUIRES plugin.

Added: 
    llvm/test/Feature/codegen-plugin-legacy.ll

Modified: 
    llvm/test/CMakeLists.txt
    llvm/unittests/CodeGen/CGPluginTest/Plugin/CMakeLists.txt
    llvm/unittests/CodeGen/CGPluginTest/PluginTest.cpp
    llvm/unittests/CodeGen/CMakeLists.txt

Removed: 
    llvm/test/Other/codegen-plugin-loading.ll


################################################################################
diff  --git a/llvm/test/CMakeLists.txt b/llvm/test/CMakeLists.txt
index 6c411e9fa99c0..18f176c3fe17f 100644
--- a/llvm/test/CMakeLists.txt
+++ b/llvm/test/CMakeLists.txt
@@ -203,6 +203,10 @@ if (TARGET llvm-calc-occupancy)
   list(APPEND LLVM_TEST_DEPENDS llvm-calc-occupancy)
 endif ()
 
+if (TARGET CGTestPlugin)
+  list(APPEND LLVM_TEST_DEPENDS CGTestPlugin)
+endif()
+
 if(LLVM_INCLUDE_EXAMPLES)
   list(APPEND LLVM_TEST_DEPENDS
     Kaleidoscope-Ch3

diff  --git a/llvm/test/Other/codegen-plugin-loading.ll b/llvm/test/Feature/codegen-plugin-legacy.ll
similarity index 75%
rename from llvm/test/Other/codegen-plugin-loading.ll
rename to llvm/test/Feature/codegen-plugin-legacy.ll
index cfbd239470ccb..0e2af7757696c 100644
--- a/llvm/test/Other/codegen-plugin-loading.ll
+++ b/llvm/test/Feature/codegen-plugin-legacy.ll
@@ -1,5 +1,5 @@
 ; RUN: llc -load-pass-plugin %llvmshlibdir/CGTestPlugin%pluginext %s -o - | FileCheck %s
-; REQUIRES: native, system-linux, llvm-dylib
+; REQUIRES: native, system-linux, llvm-dylib, plugins
 
 ; CHECK: CodeGen Test Pass running on main
 define void @main() {

diff  --git a/llvm/unittests/CodeGen/CGPluginTest/Plugin/CMakeLists.txt b/llvm/unittests/CodeGen/CGPluginTest/Plugin/CMakeLists.txt
index 6cd2e15d2968c..8c1699e007dbc 100644
--- a/llvm/unittests/CodeGen/CGPluginTest/Plugin/CMakeLists.txt
+++ b/llvm/unittests/CodeGen/CGPluginTest/Plugin/CMakeLists.txt
@@ -1,14 +1,12 @@
-if (NOT WIN32 AND NOT CYGWIN)
-  unset(LLVM_LINK_COMPONENTS)
-  add_llvm_library(CGTestPlugin MODULE BUILDTREE_ONLY
-    CodeGenTestPass.cpp
-    Plugin.cpp
+unset(LLVM_LINK_COMPONENTS)
+add_llvm_library(CGTestPlugin MODULE BUILDTREE_ONLY
+  CodeGenTestPass.cpp
+  Plugin.cpp
 
-    DEPENDS
-    intrinsics_gen
-    vt_gen
-    )
+  DEPENDS
+  intrinsics_gen
+  vt_gen
+  )
 
-  set_target_properties(CGTestPlugin PROPERTIES FOLDER "Tests")
-  add_dependencies(CGPluginTest CGTestPlugin)
-endif ()
+set_target_properties(CGTestPlugin PROPERTIES FOLDER "Tests")
+add_dependencies(CGPluginTest CGTestPlugin)

diff  --git a/llvm/unittests/CodeGen/CGPluginTest/PluginTest.cpp b/llvm/unittests/CodeGen/CGPluginTest/PluginTest.cpp
index 3e8be11c3433f..260f69c54e6d2 100644
--- a/llvm/unittests/CodeGen/CGPluginTest/PluginTest.cpp
+++ b/llvm/unittests/CodeGen/CGPluginTest/PluginTest.cpp
@@ -37,11 +37,6 @@ class CGPluginTests : public testing::Test {
 } // namespace llvm
 
 TEST_F(CGPluginTests, LoadPlugin) {
-#if !defined(LLVM_ENABLE_PLUGINS)
-  // Skip the test if plugins are disabled.
-  GTEST_SKIP();
-#endif
-
   auto PluginPath{std::string{"CGTestPlugin"} + LLVM_PLUGIN_EXT};
 
   std::string Error;
@@ -51,11 +46,6 @@ TEST_F(CGPluginTests, LoadPlugin) {
 }
 
 TEST_F(CGPluginTests, ExecuteCallback) {
-#if !defined(LLVM_ENABLE_PLUGINS)
-  // Skip the test if plugins are disabled.
-  GTEST_SKIP();
-#endif
-
   volatile bool CallbackExecuted = false;
   volatile bool MPassExecuted = false;
 

diff  --git a/llvm/unittests/CodeGen/CMakeLists.txt b/llvm/unittests/CodeGen/CMakeLists.txt
index c192672e1a093..ea8028f4cf979 100644
--- a/llvm/unittests/CodeGen/CMakeLists.txt
+++ b/llvm/unittests/CodeGen/CMakeLists.txt
@@ -59,6 +59,9 @@ add_llvm_unittest(CodeGenTests
   )
 
 add_subdirectory(GlobalISel)
-add_subdirectory(CGPluginTest)
+
+if (LLVM_ENABLE_PLUGINS)
+  add_subdirectory(CGPluginTest)
+endif()
 
 target_link_libraries(CodeGenTests PRIVATE LLVMTestingSupport)