[llvm] [Flang-RT] Disable tests by default without modules (PR #201311)

[Michael Kruse via llvm-commits]

https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/201311

>From 139bf7e5d28553ff3b15a3ac75503838b57a3cbb Mon Sep 17 00:00:00 2001
From: Michael Kruse <llvm-project at meinersbur.de>
Date: Wed, 3 Jun 2026 11:07:08 +0200
Subject: [PATCH 1/2] [Flang-RT] Disable tests by default without modules

---
 flang-rt/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/flang-rt/CMakeLists.txt b/flang-rt/CMakeLists.txt
index 0d9696e327259..22587022882b8 100644
--- a/flang-rt/CMakeLists.txt
+++ b/flang-rt/CMakeLists.txt
@@ -123,6 +123,8 @@ endif ()
 set(FLANG_RT_INCLUDE_TESTS_default ${LLVM_INCLUDE_TESTS})
 if ("${LLVM_DEFAULT_TARGET_TRIPLE}" MATCHES "^amdgcn|^nvptx")
   set(FLANG_RT_INCLUDE_TESTS_default OFF)
+elseif (NOT FLANG_RT_FORTRAN_MODULES)
+  set(FLANG_RT_INCLUDE_TESTS_default OFF)
 elseif (NOT FLANG_RT_ENABLE_STATIC AND NOT FLANG_RT_ENABLE_SHARED)
   set(FLANG_RT_INCLUDE_TESTS_default OFF)
 endif()

>From f37d63ae75a2bce4d0960eb5d71e22710acb0baa Mon Sep 17 00:00:00 2001
From: Michael Kruse <llvm-project at meinersbur.de>
Date: Wed, 3 Jun 2026 12:53:50 +0200
Subject: [PATCH 2/2] Temporarily add diagnostic code

---
 flang-rt/CMakeLists.txt             | 2 ++
 flang-rt/lib/runtime/CMakeLists.txt | 2 ++
 runtimes/cmake/config-Fortran.cmake | 8 ++++++++
 3 files changed, 12 insertions(+)

diff --git a/flang-rt/CMakeLists.txt b/flang-rt/CMakeLists.txt
index 22587022882b8..4e24f04fe3b41 100644
--- a/flang-rt/CMakeLists.txt
+++ b/flang-rt/CMakeLists.txt
@@ -114,7 +114,9 @@ else ()
 endif ()
 
 # Enable building Fortran modules if Fortran is enabled
+message("RUNTIMES_FORTRAN_MODULES: ${RUNTIMES_FORTRAN_MODULES}")
 option(FLANG_RT_FORTRAN_MODULES "Build Flang-RT modules" "${RUNTIMES_FORTRAN_MODULES}")
+message("FLANG_RT_FORTRAN_MODULES: ${FLANG_RT_FORTRAN_MODULES}")
 if (NOT FLANG_RT_ENABLE_STATIC AND NOT FLANG_RT_ENABLE_SHARED AND NOT FLANG_RT_FORTRAN_MODULES)
   message(WARNING "LLVM_ENABLE_RUNTIMES=flang-rt, but not building anything")
 endif ()
diff --git a/flang-rt/lib/runtime/CMakeLists.txt b/flang-rt/lib/runtime/CMakeLists.txt
index 20aa3effeec94..6e0b2444b3d42 100644
--- a/flang-rt/lib/runtime/CMakeLists.txt
+++ b/flang-rt/lib/runtime/CMakeLists.txt
@@ -285,6 +285,7 @@ endfunction ()
 # sources need to be added to ${sources} to be included in
 # libflang_rt.runtime{.a/.so}. If they also provide an importable .mod, add them
 # to flang_module_target(... PUBLIC).
+message("FLANG_RT_FORTRAN_MODULES: ${FLANG_RT_FORTRAN_MODULES}")
 if (FLANG_RT_FORTRAN_MODULES)
   # CMake ignores intrinsic USE dependencies
   # CMake has an option Fortran_BUILDING_INSTRINSIC_MODULES/Fortran_BUILDING_INTRINSIC_MODULES
@@ -305,6 +306,7 @@ if (FLANG_RT_FORTRAN_MODULES)
   add_dependencies(flang_rt.mod flang_rt.mod.intrinsics.barrier)
   flang_module_target(flang_rt.mod PUBLIC)
   add_module_barrier(flang-rt-mod flang_rt.mod)
+  message("flang-rt-mod created")  
 endif ()
 
 
diff --git a/runtimes/cmake/config-Fortran.cmake b/runtimes/cmake/config-Fortran.cmake
index 74fd15021f0a0..271cda699a426 100644
--- a/runtimes/cmake/config-Fortran.cmake
+++ b/runtimes/cmake/config-Fortran.cmake
@@ -148,8 +148,11 @@ else ()
 endif ()
 
 
+message("CMAKE_Fortran_COMPILER: ${CMAKE_Fortran_COMPILER}")
 include(CheckLanguage)
 check_language(Fortran)
+message("CMAKE_Fortran_COMPILER: ${CMAKE_Fortran_COMPILER}")
+message("LLVM_ENABLE_RUNTIMES: ${LLVM_ENABLE_RUNTIMES}")
 if (CMAKE_Fortran_COMPILER)
   enable_language(Fortran)
   include(CheckFortranSourceCompiles)
@@ -167,6 +170,7 @@ if (CMAKE_Fortran_COMPILER)
     # is Flang, or its intrinsic modules were built separately in a
     # non-bootstrapping build.
     check_fortran_builtins_available()
+    message("HAVE_FORTRAN_INTRINSIC_MODS: ${HAVE_FORTRAN_INTRINSIC_MODS}")
     if (HAVE_FORTRAN_INTRINSIC_MODS)
       set(RUNTIMES_ENABLE_FORTRAN ON)
       message(STATUS "Fortran support enabled using compiler's own modules")
@@ -177,6 +181,7 @@ if (CMAKE_Fortran_COMPILER)
 else ()
   message(STATUS "Fortran support disabled: not enabled in CMake; Use CMAKE_Fortran_COMPILER_WORKS=yes if the issues is missing builtin modules")
 endif ()
+message("RUNTIMES_ENABLE_FORTRAN: ${RUNTIMES_ENABLE_FORTRAN}")
 
 
 # Check whether modules files are compatible with our version of Flang.
@@ -184,7 +189,10 @@ set(RUNTIMES_FORTRAN_MODULES_default OFF)
 if (RUNTIMES_ENABLE_FORTRAN AND CMAKE_Fortran_COMPILER_ID STREQUAL "LLVMFlang")
   set(RUNTIMES_FORTRAN_MODULES_default ON)
 endif ()
+message("CMAKE_Fortran_COMPILER_ID: ${RUNTIMECMAKE_Fortran_COMPILER_IDS_ENABLE_FORTRAN}")
+message("RUNTIMES_FORTRAN_MODULES_default: ${RUNTIMES_FORTRAN_MODULES_default}")
 option(RUNTIMES_FORTRAN_MODULES "Make Fortran .mod files available to Flang; should only be enabled if compiling with a matching version of Flang" "${RUNTIMES_FORTRAN_MODULES_default}")
+message("RUNTIMES_FORTRAN_MODULES: ${RUNTIMES_FORTRAN_MODULES}")
 
 # Determine the paths for Fortran .mod files.
 if (RUNTIMES_FORTRAN_MODULES)