flang-compiler · sscalpone · Mar 13, 2020 · Feb 21, 2020 · Feb 19, 2020 · Feb 14, 2020
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -154,9 +154,9 @@ enable_testing()
 add_subdirectory(include/flang)
 add_subdirectory(lib)
 add_subdirectory(runtime)
-add_subdirectory(test)
+add_subdirectory(unittests)
 add_subdirectory(tools)
-add_subdirectory(test-lit)
+add_subdirectory(test)
 
 configure_file(
   ${FLANG_SOURCE_DIR}/include/flang/Config/config.h.cmake

diff --git a/test-lit/CMakeLists.txt b/test-lit/CMakeLists.txt
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,12 +1,30 @@
-#===-- test/CMakeLists.txt -------------------------------------------------===#
-#
-# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-# See https://llvm.org/LICENSE.txt for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-#
-#===------------------------------------------------------------------------===#
-
-add_subdirectory(Decimal)
-add_subdirectory(Evaluate)
-add_subdirectory(Runtime)
-add_subdirectory(Semantics)
+# Test runner infrastructure for Flang. This configures the Flang test trees
+# for use by Lit, and delegates to LLVM's lit test handlers.
+
+set(FLANG_INTRINSIC_MODULES_DIR ${FLANG_BINARY_DIR}/tools/f18/include)
+
+configure_lit_site_cfg(
+  ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
+  ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
+  MAIN_CONFIG
+  ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
+)
+
+set(FLANG_TEST_PARAMS
+  flang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py)
+
+set(FLANG_TEST_DEPENDS
+  f18
+)
+
+if (LINK_WITH_FIR)
+  list(APPEND FLANG_TEST_DEPENDS tco)
+endif()
+
+add_lit_testsuite(check-all "Running the Flang regression tests"
+  ${CMAKE_CURRENT_BINARY_DIR}
+  PARAMS ${FLANG_TEST_PARAMS}
+  DEPENDS ${FLANG_TEST_DEPENDS}
+  )
+set_target_properties(check-all PROPERTIES FOLDER "Tests")
+
diff --git a/test-lit/Driver/version_test.f90 → test/Driver/version_test.f90 b/test-lit/Driver/version_test.f90 → test/Driver/version_test.f90
diff --git a/test/Evaluate/folding01.f90 b/test/Evaluate/folding01.f90
@@ -1,3 +1,4 @@
+! RUN: %S/test_folding.sh %s %flang %t
 
 ! Test intrinsic operation folding
 

diff --git a/test/Evaluate/folding02.f90 b/test/Evaluate/folding02.f90
@@ -1,3 +1,4 @@
+! RUN: %S/test_folding.sh %s %flang %t
 ! Check intrinsic function folding with host runtime library
 
 module m

diff --git a/test/Evaluate/folding03.f90 b/test/Evaluate/folding03.f90
@@ -1,3 +1,4 @@
+! RUN: %S/test_folding.sh %s %flang %t
 ! Test operation folding edge case (both expected value and messages)
 ! These tests make assumptions regarding real(4) and integer(4) extrema.
 

diff --git a/test/Evaluate/folding04.f90 b/test/Evaluate/folding04.f90
@@ -1,3 +1,4 @@
+! RUN: %S/test_folding.sh %s %flang %t
 ! Test intrinsic function folding edge case (both expected value and messages)
 ! These tests make assumptions regarding real(4) extrema.
 

diff --git a/test/Evaluate/folding05.f90 b/test/Evaluate/folding05.f90
diff --git a/test/Evaluate/folding06.f90 b/test/Evaluate/folding06.f90
@@ -1,3 +1,4 @@
+! RUN: %S/test_folding.sh %s %flang %t
 ! Test transformational intrinsic function folding
 
 module m

diff --git a/test/Evaluate/folding07.f90 b/test/Evaluate/folding07.f90
@@ -1,3 +1,4 @@
+! RUN: %S/test_folding.sh %s %flang %t
 ! Test numeric model inquiry intrinsics
 
 module m

diff --git a/test/Evaluate/folding08.f90 b/test/Evaluate/folding08.f90
@@ -1,3 +1,4 @@
+! RUN: %S/test_folding.sh %s %flang %t
 ! Test folding of LBOUND and UBOUND
 
 module m

diff --git a/test/Evaluate/folding09.f90 b/test/Evaluate/folding09.f90
@@ -1,3 +1,4 @@
+! RUN: %S/test_folding.sh %s %flang %t
 ! Test folding of IS_CONTIGUOUS on simply contiguous items (9.5.4)
 ! When IS_CONTIGUOUS() is constant, it's .TRUE.
 

diff --git a/test/Evaluate/test_folding.sh b/test/Evaluate/test_folding.sh
@@ -19,28 +19,25 @@
 #   - test_x is not folded (it is neither .true. nor .false.). This means the
 #     compiler could not fold the expression.
 
-PATH=/usr/bin:/bin
-srcdir=$(dirname $0)
-F18CC=${F18:-../../../tools/f18/bin/f18}
-CMD="$F18CC -fdebug-dump-symbols -fparse-only"
+CMD="$2 -fdebug-dump-symbols -fparse-only"
 
-if [[ $# < 1 ]]; then
-  echo "Usage: $0 <fortran-source> [-pgmath=<true/false>]"
+if [[ $# < 3 ]]; then
+  echo "Usage: $0 <fortran-source> <f18-executable> <temp test dir>"
   exit 1
 fi
 
-src=$srcdir/$1
+src=$1
 [[ ! -f $src ]] && echo "File not found: $src" && exit 1
 
-temp=temp-$1
-rm -rf $temp
-mkdir $temp
-[[ $KEEP ]] || trap "rm -rf $temp" EXIT
+temp=$3
+mkdir -p $temp
 
 # Check if tests should assume folding is using libpgmath
-if [[ $# > 1 && "$2" = "-pgmath=true" ]]; then
+if [[ $LIBPGMATH ]]; then
   CMD="$CMD -DTEST_LIBPGMATH"
   echo "Assuming libpgmath support"
+else
+  echo "Not assuming libpgmath support"
 fi
 
 src1=$temp/symbols.log

diff --git a/test-lit/Fir/fir-ops.fir → test/Fir/fir-ops.fir b/test-lit/Fir/fir-ops.fir → test/Fir/fir-ops.fir
diff --git a/test-lit/Fir/fir-types.fir → test/Fir/fir-types.fir b/test-lit/Fir/fir-types.fir → test/Fir/fir-types.fir
diff --git a/test-lit/Lower/pre-fir-tree01.f90 → test/Lower/pre-fir-tree01.f90 b/test-lit/Lower/pre-fir-tree01.f90 → test/Lower/pre-fir-tree01.f90
diff --git a/test-lit/Lower/pre-fir-tree02.f90 → test/Lower/pre-fir-tree02.f90 b/test-lit/Lower/pre-fir-tree02.f90 → test/Lower/pre-fir-tree02.f90
diff --git a/test-lit/Lower/pre-fir-tree03.f90 → test/Lower/pre-fir-tree03.f90 b/test-lit/Lower/pre-fir-tree03.f90 → test/Lower/pre-fir-tree03.f90
diff --git a/test-lit/Lower/pre-fir-tree04.f90 → test/Lower/pre-fir-tree04.f90 b/test-lit/Lower/pre-fir-tree04.f90 → test/Lower/pre-fir-tree04.f90
diff --git a/test/Preprocessing/lit.local.cfg.py b/test/Preprocessing/lit.local.cfg.py
@@ -0,0 +1,7 @@
+# -*- Python -*-
+
+from lit.llvm import llvm_config
+
+# Added this line file to prevent lit from discovering these tests
+# See Issue #1052
+config.suffixes = []