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
26 lines
593 B
Bash
26 lines
593 B
Bash
# Common functionality for test scripts
|
|
# Process arguments, expecting source file as 1st; optional path to f18 as 2nd
|
|
# Set: $F18 to the path to f18 with options; $temp to an empty temp directory;
|
|
# and $src to the full path of the single source argument.
|
|
|
|
function die {
|
|
echo "$(basename $0): $*" >&2
|
|
exit 1
|
|
}
|
|
if [[ $# < 3 ]]; then
|
|
echo "Usage: $(basename $0) <fortran-source> <temp test dir> <f18-command>"
|
|
exit 1
|
|
fi
|
|
|
|
case $1 in
|
|
(/*) src="$1" ;;
|
|
(*) src="$(dirname $0)/$1" ;;
|
|
esac
|
|
shift
|
|
temp=$1
|
|
mkdir -p $temp
|
|
shift
|
|
|
|
[[ ! -f $1 ]] && die "f18 executable not found: $1"
|
|
F18="$*"
|