From 405f36dd357a9825edd99a4ffc5b0ecd871e6e49 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Wed, 12 Nov 2003 21:21:55 +0000 Subject: [PATCH] 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 --- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/ada/acats/run_acats | 8 ++++---- 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 9bbb196e30b..8d00a736d48 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2003-11-12 Rainer Orth + + * 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 * 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 c69a4e1fe3e..c037a3f9791 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 cc7de47a7e8..73605a410c0 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 -- 2.30.2