Skip to content

Commit

Permalink
Added CMakeLists changes, moved config and made test scripts compatible.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
LukeIreland1 committed Mar 6, 2020
1 parent c22ce5e commit 8180882
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 382 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
13 changes: 4 additions & 9 deletions test/Evaluate/test_folding.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,18 @@
# - 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>]"
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
Expand Down
9 changes: 9 additions & 0 deletions test/Preprocessing/lit.local.cfg.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import os
import platform
import sys

import lit.formats
from lit.llvm import llvm_config

# Issue 1052
config.suffixes = [] # Don't run these ported tests
345 changes: 0 additions & 345 deletions test/Semantics/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 8180882

Please sign in to comment.