This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
committed: Ada test suite fixes
- From: Arnaud Charlet <charlet at ACT-Europe dot FR>
- To: gcc-patches at gcc dot gnu dot org
- Date: Fri, 14 Nov 2003 11:06:12 +0100
- Subject: committed: Ada test suite fixes
Tested by running make check-ada
--
PR ada/13035
* ada/acats/run_acats, run_all.sh: Fix syntax errors.
No longer use a wrapper for gcc, since this does not work under
Windows, use --GCC switch instead.
--
Index: run_acats
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/ada/acats/run_acats,v
retrieving revision 1.2
diff -u -r1.2 run_acats
--- run_acats 12 Nov 2003 21:21:55 -0000 1.2
+++ run_acats 14 Nov 2003 09:59:33 -0000
@@ -7,17 +7,14 @@
# Set up environment to use the Ada compiler from the object tree
-host_gnatmake=`type gnatmake | awk '{print $3}`
-host_gcc=`type gcc | awk '{print $3}`
+host_gnatmake=`type gnatmake | awk '{print $3}'`
ROOT=`${PWDCMD-pwd}`
BASE=`cd $ROOT/../../..; ${PWDCMD-pwd}`
PATH=$BASE:$ROOT:$PATH
ADA_INCLUDE_PATH=$BASE/ada/rts
ADA_OBJECTS_PATH=$ADA_INCLUDE_PATH
-export PATH ADA_INCLUDE_PATH ADA_OBJECTS_PATH
-
-echo '#!/bin/sh' > gcc
-echo exec $BASE/xgcc -B$BASE/ '"$@"' >> gcc
+GCC="$BASE/xgcc -B$BASE/"
+export PATH ADA_INCLUDE_PATH ADA_OBJECTS_PATH GCC
echo '#!/bin/sh' > host_gnatmake
echo PATH=`dirname $host_gnatmake`:'$PATH' >> host_gnatmake
@@ -25,11 +22,6 @@
echo export PATH >> host_gnatmake
echo exec $host_gnatmake '"$@"' >> host_gnatmake
-echo '#!/bin/sh' > host_gcc
-echo PATH=`dirname $host_gcc`:'$PATH' >> host_gcc
-echo export PATH >> host_gcc
-echo exec $host_gcc '"$@"' >> host_gcc
-
-chmod +x gcc host_gnatmake host_gcc
+chmod +x host_gnatmake
exec $testdir/run_all.sh "$@"
Index: run_all.sh
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/ada/acats/run_all.sh,v
retrieving revision 1.9
diff -u -r1.9 run_all.sh
--- run_all.sh 12 Nov 2003 21:21:55 -0000 1.9
+++ run_all.sh 14 Nov 2003 09:59:33 -0000
@@ -48,11 +48,11 @@
fi
target_gnatmake () {
- gnatmake $gnatflags $gccflags $* -largs $EXTERNAL_OBJECTS
+ gnatmake --GCC="$GCC" $gnatflags $gccflags $* -largs $EXTERNAL_OBJECTS --GCC="$GCC"
}
target_gcc () {
- gcc $gccflags $*
+ $GCC $gccflags $*
}
clean_dir () {
@@ -66,10 +66,10 @@
display " === acats configuration ==="
-display `type gcc`
-display `gcc -v 2>&1`
-display host=`host_gcc -dumpmachine`
-display target=`gcc -dumpmachine`
+display target gcc is $GCC
+display `$GCC -v 2>&1`
+display host=`gcc -dumpmachine`
+display target=`$GCC -dumpmachine`
display `type gnatmake`
gnatls -v >> $dir/acats.log
display ""
@@ -114,7 +114,7 @@
fi
./macrosub > macrosub.out 2>&1
-host_gcc -c cd300051.c
+gcc -c cd300051.c
host_gnatmake -q -gnatws widechr.adb
if [ $? -ne 0 ]; then
display "**** Failed to compile widechr"