[test-suite] Decouple Fortran tests from C/C++ tests.

[naromero77]

Summary

Fortran tests now go in top-level Fortran subdirectory and can be run with or without C/C++ tests.

Fortran tests are still excluded by default.

[Meinersbur]

I suggest to put each test into its own directly, i.e. the hello test into Fortran/UnitTests/hello. This would allow selecting each test separately using TEST_SUITE_SUBDIRS (instead of having to select all Fortran UnitTests/Benchmarks at the same time) and each test can itself decide whether it is using llvm_singlesource() or llvm_multisource().

[naromero77]

• Move hello test to its own subdirectory on UnitTests
• include Fortran helper moduler in top-level CMakeLists.txt to permit selection of individual UnitTests.
• Additional CMakeLists.txt needed at this intermediate level.
• Update comment in Fortran subdirectory CMakeLists.

[Meinersbur]

Ideally, how a test is executed is entirely specified in one file (the CMakeLists.txt), instead split between two files. In the standard case, a lit.local.cfg should not be required.

I don't expect a redesign of the build system, so LGTM.

Fortran/UnitTests/hello/lit.local.cfg

2

With config.traditional_output, stderr, stdout and the error code are implicitly redirected to a .out file . If false, the stderr/stdout files are specified explicitly. I think it is meant as a compatibility switch to make rewriting the build to CMake easier.

3

config.single_source is used for the "compiletime" and "stats" plugin to find the compile'r auxiliary output files. This is already unreliable (e.g. they ignore the CMake PREFIX argument, because the lit cfg has not idea what the PREFIX argument in the CMakeLists.txt is). This does need an overhaul.

CMakeLists.txt

 else()
   STRING(REGEX REPLACE "^lib" "" TEST_SUITE_CXX_ABI_LIBNAME ${TEST_SUITE_CXX_ABI})
 endif()
 
 include(TestSuite)
 include(SingleMultiSource)
 # Needs by External/sollve_vv.
 find_package(OpenMP)
+# Fortran Helper Modules
+if(TEST_SUITE_FORTRAN)
+  include(Fortran)
+endif()
 
 if(NOT DEFINED TARGET_OS)
   message(STATUS "Check target operating system - ${CMAKE_SYSTEM_NAME}")
   set(TARGET_OS ${CMAKE_SYSTEM_NAME})
 endif()
 if(NOT DEFINED ARCH)
   include(DetectArchitecture)
   detect_architecture(ARCH)
if(NOT TEST_SUITE_SUBDIRS)
   file(GLOB sub_cmakelists RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} */CMakeLists.txt)
   set(TEST_SUITE_SUBDIRS "")
   foreach(entry ${sub_cmakelists})
     get_filename_component(subdir ${entry} DIRECTORY)
    # Exclude tools and CTMark from default list
     if(NOT ${subdir} STREQUAL tools AND NOT ${subdir} STREQUAL CTMark)
       list(APPEND TEST_SUITE_SUBDIRS ${subdir})
     endif()
+    # Exclude Fortran tests unless explicitly activated
+    if(NOT TEST_SUITE_FORTRAN)
+      list(REMOVE_ITEM TEST_SUITE_SUBDIRS Fortran)
+    endif()
   endforeach()
   set(TEST_SUITE_SUBDIRS "${TEST_SUITE_SUBDIRS}")
 endif()
 set(TEST_SUITE_SUBDIRS "${TEST_SUITE_SUBDIRS}" CACHE STRING
     "Semicolon separated list of directories with CMakeLists.txt to include")
 
 foreach(subdir ${TEST_SUITE_SUBDIRS})
   # When we add subdirs outside the toplevel source directory then we have to

Fortran/CMakeLists.txt

+# Fortran TestSuite Directory Structure (TENTATIVE):
+#
+# UnitTests    - Single source tests for language features
+# Benchmarks   - Single source tests for benchmarking
+# Applications - Multi-source tests for proxy apps, small apps, etc.
+#
+# This file should only contain add_subdirectory(...) one for each test
+# directory
+add_subdirectory(UnitTests)

Fortran/UnitTests/CMakeLists.txt

+# This file should only contain add_subdirectory(...) one for each test
+add_subdirectory(hello)

Fortran/UnitTests/hello/CMakeLists.txt

+llvm_singlesource()
+
+file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")

Fortran/UnitTests/hello/lit.local.cfg

+config.traditional_output = True
+config.single_source = True

SingleSource/UnitTests/CMakeLists.txt

 include(CheckCCompilerFlag)
 
 add_subdirectory(C++11)
 add_subdirectory(SignlessTypes)
 add_subdirectory(Threads)
 add_subdirectory(Vector)
 add_subdirectory(Vectorizer)
 # FIXME: Disable SJLJ tests for now, until EH edges are represented.
 # add_subdirectory(SetjmpLongjmp)
 if(TARGET_OS STREQUAL "Darwin")
   add_subdirectory(ObjC)
   add_subdirectory(ObjC++)
 endif()
 
-# Fortran
-if(TEST_SUITE_FORTRAN)
-  add_subdirectory(Fortran)
-endif()
-
 file(GLOB Source RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.c *.cpp)
 if(TARGET_OS STREQUAL "AIX" AND ARCH STREQUAL "PowerPC" AND NOT PPC_IS_PPC64_ENABLED) 
   list(REMOVE_ITEM Source AtomicOps.c)
 endif()
 if(TARGET_OS STREQUAL "Darwin")
   list(REMOVE_ITEM Source 2007-04-25-weak.c)
   if(ARCH STREQUAL "PowerPC")
     list(REMOVE_ITEM Source AtomicOps.c)

SingleSource/UnitTests/Fortran/CMakeLists.txt

-llvm_singlesource()