diff options
| author | Arnaud Charlet <charlet@act-europe.fr> | 2003-11-14 11:04:31 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2003-11-14 11:04:31 +0100 |
| commit | 7fb768e5dcf9ce539e511f9ca0871e4a866c5a54 (patch) | |
| tree | 692ce97ccc8099a421e07e4ad2bc9fc4d81446f9 | |
| parent | c60cfc76bea8bba00426dbfca01cd14a4aa49a22 (diff) | |
| download | gcc-7fb768e5dcf9ce539e511f9ca0871e4a866c5a54.zip gcc-7fb768e5dcf9ce539e511f9ca0871e4a866c5a54.tar.gz gcc-7fb768e5dcf9ce539e511f9ca0871e4a866c5a54.tar.bz2 | |
re PR ada/13035 (Ada testsuite uses installed gcc)
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.
From-SVN: r73592
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rwxr-xr-x | gcc/testsuite/ada/acats/run_acats | 16 | ||||
| -rwxr-xr-x | gcc/testsuite/ada/acats/run_all.sh | 14 |
3 files changed, 18 insertions, 19 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 845b6f1..f5d577a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2003-11-14 Arnaud Charlet <charlet@act-europe.fr> + + PR ada/13035 + * ada/acats/run_acats, run_all.sh: Fix syntax error. + No longer use a wrapper for gcc, since this does not work under + Windows. + 2003-11-14 Giovanni Bajo <giovannibajo@libero.it> PR c++/2094 diff --git a/gcc/testsuite/ada/acats/run_acats b/gcc/testsuite/ada/acats/run_acats index c037a3f..2796385 100755 --- a/gcc/testsuite/ada/acats/run_acats +++ b/gcc/testsuite/ada/acats/run_acats @@ -7,17 +7,14 @@ fi # 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 unset ADA_INCLUDE_PATH ADA_OBJECTS_PATH GCC_EXEC_PREFIX >> host_gnatmake 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 "$@" diff --git a/gcc/testsuite/ada/acats/run_all.sh b/gcc/testsuite/ada/acats/run_all.sh index 73605a4..f6b1cb4 100755 --- a/gcc/testsuite/ada/acats/run_all.sh +++ b/gcc/testsuite/ada/acats/run_all.sh @@ -48,11 +48,11 @@ if [ "$dir" = "$testdir" ]; then 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 @@ rm -f $dir/acats.sum $dir/acats.log 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 @@ if [ $? -ne 0 ]; then 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" |