Skip to content

Commit

Permalink
[flang] Added CMakeLists changes, moved config and made test scripts …
Browse files Browse the repository at this point in the history
…compatible.

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

Original-commit: flang-compiler/f18@3f99d35
Reviewed-on: flang-compiler/f18#1027
  • Loading branch information
LukeIreland1 committed Mar 13, 2020
1 parent f1a8eae commit da9d002
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 380 deletions.
2 changes: 1 addition & 1 deletion flang/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,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
Expand Down
File renamed without changes.
21 changes: 9 additions & 12 deletions flang/test/Evaluate/test_folding.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions flang/test/Preprocessing/lit.local.cfg.py
Original file line number Diff line number Diff line change
@@ -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 = []
Loading

0 comments on commit da9d002

Please sign in to comment.