Index: gcc/gcc/testsuite/ada/acats/run_all.sh |
diff --git a/gcc/gcc/testsuite/ada/acats/run_all.sh b/gcc/gcc/testsuite/ada/acats/run_all.sh |
index ddd4da0f300d279cca0444d90b56fe19f1e57cba..eb30fbc335671d400ad9b88ef62c62f2af804eda 100755 |
--- a/gcc/gcc/testsuite/ada/acats/run_all.sh |
+++ b/gcc/gcc/testsuite/ada/acats/run_all.sh |
@@ -13,7 +13,7 @@ gccflags="-O2" |
gnatflags="-gnatws" |
target_run () { |
-$* |
+ eval $EXPECT -f $testdir/run_test.exp $* |
} |
# End of customization section. |
@@ -76,6 +76,8 @@ EXTERNAL_OBJECTS="" |
rm -f $dir/acats.sum $dir/acats.log |
+display "Test Run By $USER on `date`" |
+ |
display " === acats configuration ===" |
target=`$GCC -dumpmachine` |
@@ -129,6 +131,7 @@ sed -e "s,ACATS4GNATDIR,$dir,g" \ |
cp $testdir/tests/cd/*.c $dir/support |
cp $testdir/tests/cxb/*.c $dir/support |
+grep -v '^#' $testdir/norun.lst | sort > $dir/support/norun.lst |
rm -rf $dir/run |
mv $dir/tests $dir/tests.$$ 2> /dev/null |
@@ -206,7 +209,7 @@ for chapter in $chapters; do |
cd $dir/tests/$chapter |
ls *.a *.ada *.adt *.am *.dep 2> /dev/null | sed -e 's/\(.*\)\..*/\1/g' | \ |
- cut -c1-7 | sort | uniq | comm -23 - $testdir/norun.lst \ |
+ cut -c1-7 | sort | uniq | comm -23 - $dir/support/norun.lst \ |
> $dir/tests/$chapter/${chapter}.lst |
countn=`wc -l < $dir/tests/$chapter/${chapter}.lst` |
glob_countn=`expr $glob_countn + $countn` |
@@ -281,7 +284,7 @@ for chapter in $chapters; do |
cat ${i}.log >> $dir/acats.log |
egrep -e '(==== |\+\+\+\+ |\!\!\!\! )' ${i}.log > /dev/null 2>&1 |
if [ $? -ne 0 ]; then |
- grep 'Tasking not implemented' ${i}.log > /dev/null 2>&1 |
+ grep 'tasking not implemented' ${i}.log > /dev/null 2>&1 |
if [ $? -ne 0 ]; then |
display "FAIL: $i" |
@@ -311,4 +314,6 @@ if [ $glob_countok -ne $glob_countn ]; then |
display "*** FAILURES: $failed" |
fi |
+display "$0 completed at `date`" |
+ |
exit 0 |