diff options
author | Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> | 2003-11-12 21:21:55 +0000 |
---|---|---|
committer | Rainer Orth <ro@gcc.gnu.org> | 2003-11-12 21:21:55 +0000 |
commit | 405f36dd357a9825edd99a4ffc5b0ecd871e6e49 (patch) | |
tree | 01b978659a6a5f8524b9c99ee24d377b4f4846b7 /gcc/testsuite | |
parent | 0e59b3fb64d1bce60568a79e3ff37d5f61539a43 (diff) | |
download | gcc-405f36dd357a9825edd99a4ffc5b0ecd871e6e49.zip gcc-405f36dd357a9825edd99a4ffc5b0ecd871e6e49.tar.gz gcc-405f36dd357a9825edd99a4ffc5b0ecd871e6e49.tar.bz2 |
run_acats (host_gnatmake): Use type in a /bin/sh script.
* ada/acats/run_acats (host_gnatmake): Use type in a /bin/sh script.
(host_gcc): Likewise.
(ROOT): Honor $PWDCMD.
(BASE): Likewise.
* ada/acats/run_all.sh (dir): Honor $PWDCMD.
From-SVN: r73510
Diffstat (limited to 'gcc/testsuite')
-rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
-rwxr-xr-x | gcc/testsuite/ada/acats/run_acats | 8 | ||||
-rwxr-xr-x | gcc/testsuite/ada/acats/run_all.sh | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9bbb196..8d00a73 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2003-11-12 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> + + * ada/acats/run_acats (host_gnatmake): Use type in a /bin/sh script. + (host_gcc): Likewise. + (ROOT): Honor $PWDCMD. + (BASE): Likewise. + * ada/acats/run_all.sh (dir): Honor $PWDCMD. + 2003-11-12 Catherine Moore <clm@redhat.com> * gcc.c-torture/execute/20020720-1.x: Add xfail for frv-*-*. diff --git a/gcc/testsuite/ada/acats/run_acats b/gcc/testsuite/ada/acats/run_acats index c69a4e1..c037a3f 100755 --- a/gcc/testsuite/ada/acats/run_acats +++ b/gcc/testsuite/ada/acats/run_acats @@ -7,10 +7,10 @@ fi # Set up environment to use the Ada compiler from the object tree -host_gnatmake=`which gnatmake` -host_gcc=`which gcc` -ROOT=`pwd` -BASE=`cd $ROOT/../../..; pwd` +host_gnatmake=`type gnatmake | awk '{print $3}` +host_gcc=`type gcc | 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 diff --git a/gcc/testsuite/ada/acats/run_all.sh b/gcc/testsuite/ada/acats/run_all.sh index cc7de47..73605a4 100755 --- a/gcc/testsuite/ada/acats/run_all.sh +++ b/gcc/testsuite/ada/acats/run_all.sh @@ -35,7 +35,7 @@ log () { echo "$@" >> $dir/acats.log } -dir=`pwd` +dir=`${PWDCMD-pwd}` if [ "$testdir" = "" ]; then echo You must use make check or make check-ada |