Added CMakeLists changes, moved config and made test scripts compatible.

All Fortran tests are now run in lit, except Preprocessing tests flang-compiler#1052
Preprocessing tests are a separate kind of test, so will be sorted out
later.

CMakeLists.txt

@@ -147,7 +147,7 @@ add_subdirectory(lib)
 add_subdirectory(runtime)
 add_subdirectory(unittests)
 add_subdirectory(tools)
-add_subdirectory(test-lit)
+add_subdirectory(test)
 
 configure_file(
   ${FLANG_SOURCE_DIR}/include/flang/Config/config.h.cmake

test/Evaluate/lit.local.cfg.py

@@ -0,0 +1,10 @@
+# -*- Python -*-
+
+import os
+import platform
+import sys
+
+import lit.formats
+from lit.llvm import llvm_config
+
+config.environment["LIBPGMATH"] = "False"

test/Evaluate/test_folding.sh

@@ -19,26 +19,21 @@
 #   - 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>]"
+  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 == "True" ]]; then
   CMD="$CMD -DTEST_LIBPGMATH"
   echo "Assuming libpgmath support"
 fi

test/Preprocessing/lit.local.cfg.py

@@ -0,0 +1,12 @@
+# -*- Python -*-
+
+import os
+import platform
+import sys
+
+import lit.formats
+from lit.llvm import llvm_config
+
+# Added this lit config file to prevent lit from discovering these tests
+# See Issue #1052
+config.suffixes = []