maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[flang] Fix test script portability problems. 

Allow for bash anywhere on path.

Allow for utilites to be in /bin as well as /usr/bin.

Don't count on sed understanding '\t'.

The options to mktemp aren't portable. Instead just create a per-test
temp directory in the working directory (i.e. <build-dir>/test/semantics).
Setting the KEEP environment variable causes them all to be kept to help
in investigating failures.

Fixes flang-compiler/f18#128.

Original-commit: flang-compiler/f18@3736ceeca8
Reviewed-on: https://github.com/flang-compiler/f18/pull/129
This commit is contained in:
Tim Keith 2018-07-17 16:43:20 -07:00
parent c11a62a3dd
commit bfd0703234
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
flang/test/semantics/test_errors.sh
View File

@ -1,4 +1,4 @@
#!/usr/bin/bash
#!/usr/bin/env bash
# Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@ -16,7 +16,7 @@
# Compile a source file and check errors against those listed in the file.
# Change the compiler by setting the F18 environment variable.
PATH=/usr/bin
PATH=/usr/bin:/bin
srcdir=$(dirname $0)
CMD="${F18:-../../tools/f18/f18} -fdebug-resolve-names -fparse-only"
@ -27,8 +27,11 @@ fi
src=$srcdir/$1
[[ ! -f $src ]] && echo "File not found: $src" && exit 1
temp=$(mktemp --directory --tmpdir=.)
trap "rm -rf $temp" EXIT
temp=temp-$1
rm -rf $temp
mkdir $temp
[[ $KEEP ]] || trap "rm -rf $temp" EXIT
log=$temp/log
actual=$temp/actual
expect=$temp/expect
@ -40,7 +43,7 @@ $cmd > $log 2>&1
# $actual has errors from the compiler; $expect has them from !ERROR comments in source
# Format both as "<line>: <text>" so they can be diffed.
sed -n 's=^[^:]*:\([^:]*\):[^:]*: error: =\1: =p' $log > $actual
{ echo; cat $src; } | cat -n | sed -n 's=^ *\([0-9]*\)\t *\!ERROR: *=\1: =p' > $expect
{ echo; cat $src; } | cat -n | sed -n 's=^ *\([0-9]*\). *\!ERROR: *=\1: =p' > $expect
if diff -U0 $actual $expect > $diffs; then
echo PASS

14
flang/test/semantics/test_modfile.sh
View File

@ -1,4 +1,4 @@
#!/usr/bin/bash
#!/usr/bin/env bash
# Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@ -16,7 +16,7 @@
# Compile a source file and compare generated .mod files against expected.
set -e
PATH=/usr/bin
PATH=/usr/bin:/bin
srcdir=$(dirname $0)
CMD="${F18:-../../../tools/f18/f18} -fdebug-resolve-names -fparse-only"
@ -27,12 +27,10 @@ fi
src=$srcdir/$1
[[ ! -f $src ]] && echo "File not found: $src" && exit 1
if [[ $KEEP ]]; then
temp=.
else
temp=$(mktemp --directory --tmpdir=.)
trap "rm -rf $temp" EXIT
fi
temp=temp-$1
rm -rf $temp
mkdir $temp
[[ $KEEP ]] || trap "rm -rf $temp" EXIT
( cd $temp && $CMD $src )

15
flang/test/semantics/test_symbols.sh
View File

@ -1,4 +1,4 @@
#!/usr/bin/bash
#!/usr/bin/env bash
# Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@ -18,7 +18,7 @@
# the same as the input, except for the copyright comment.
# Change the compiler by setting the F18 environment variable.
PATH=/usr/bin
PATH=/usr/bin:/bin
srcdir=$(dirname $0)
CMD="${F18:-../../tools/f18/f18} -funparse-with-symbols"
@ -29,12 +29,11 @@ fi
src=$srcdir/$1
[[ ! -f $src ]] && echo "File not found: $src" && exit 1
if [[ $KEEP ]]; then
temp=.
else
temp=$(mktemp --directory --tmpdir=.)
trap "rm -rf $temp" EXIT
fi
temp=temp-$1
rm -rf $temp
mkdir $temp
[[ $KEEP ]] || trap "rm -rf $temp" EXIT
src1=$temp/1.f90
src2=$temp/2.f90
src3=$temp/3.f90