99aa87a5b5
There were several different ways of handling the option to f18 to find predefined modules: - test_errors.sh was created by cmake substituting FLANG_INTRINSIC_MODULES_DIR into test_errors.sh.in - some tests used the flang script which has the option built it - some tests used %f18_with_includes which was replaced by the path to f18 plus the -I option - some included -I../../include/flang in their run command To make this more consistent, change %f18 to include the -intrinsic-module-directory option and use it everywhere, including to replace %flang and %f18_with_includes. This requires changing all of the invocations of the test scripts to put %f18 at the end so that it can expand to more than one argument. This eliminates the need to generate test_errors.sh which means we don't need flang/test/Semantics/CMakeLists.txt or the %B substitution. That makes the test_errors.sh command like the others, replacing %B/test/Semantics/test_errors.sh with %S/test_errors.sh. Also remove the OPTIONS: functionality as custom options can be included in the RUN: command. And remove -I/../../include/flang as that is now always included. Differential Revision: https://reviews.llvm.org/D79634
50 lines
1.4 KiB
Bash
Executable File
50 lines
1.4 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Compile a source file and compare generated .mod files against expected.
|
|
|
|
set -e
|
|
F18_OPTIONS="-fdebug-resolve-names -fparse-only"
|
|
srcdir=$(dirname $0)
|
|
source $srcdir/common.sh
|
|
|
|
actual=$temp/actual.mod
|
|
expect=$temp/expect.mod
|
|
actual_files=$temp/actual_files
|
|
prev_files=$temp/prev_files
|
|
diffs=$temp/diffs
|
|
|
|
set $src
|
|
|
|
touch $actual
|
|
for src in "$@"; do
|
|
[[ ! -f $src ]] && echo "File not found: $src" && exit 1
|
|
path=$(git ls-files --full-name $src 2>/dev/null || echo $src)
|
|
(
|
|
cd $temp
|
|
ls -1 *.mod > prev_files
|
|
$F18 $F18_OPTIONS $src
|
|
ls -1 *.mod | comm -13 prev_files -
|
|
) > $actual_files
|
|
expected_files=$(sed -n 's/^!Expect: \(.*\)/\1/p' $src | sort)
|
|
extra_files=$(echo "$expected_files" | comm -23 $actual_files -)
|
|
if [[ ! -z "$extra_files" ]]; then
|
|
echo "Unexpected .mod files produced:" $extra_files
|
|
die FAIL $path
|
|
fi
|
|
for mod in $expected_files; do
|
|
if [[ ! -f $temp/$mod ]]; then
|
|
echo "Compilation did not produce expected mod file: $mod"
|
|
die FAIL $path
|
|
fi
|
|
# The first three bytes of the file are a UTF-8 BOM
|
|
sed '/^[^!]*!mod\$/d' $temp/$mod > $actual
|
|
sed '1,/^!Expect: '"$mod"'/d' $src | sed -e '/^$/,$d' -e 's/^!//' > $expect
|
|
if ! diff -w -U999999 $expect $actual > $diffs; then
|
|
echo "Module file $mod differs from expected:"
|
|
sed '1,2d' $diffs
|
|
die FAIL $path
|
|
fi
|
|
done
|
|
rm -f $actual $expect
|
|
done
|
|
echo PASS
|