summaryrefslogtreecommitdiff
path: root/gcc/testsuite/ada
diff options
context:
space:
mode:
authorro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>2003-11-12 21:21:55 +0000
committerro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>2003-11-12 21:21:55 +0000
commit8100db329f88c01291bdfe263be3dd693816a8a3 (patch)
tree01b978659a6a5f8524b9c99ee24d377b4f4846b7 /gcc/testsuite/ada
parentc3fbce205360c2a5d502dd6cb40f552a4cd29df5 (diff)
downloadgcc-8100db329f88c01291bdfe263be3dd693816a8a3.tar.gz
* 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73510 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/testsuite/ada')
-rwxr-xr-xgcc/testsuite/ada/acats/run_acats8
-rwxr-xr-xgcc/testsuite/ada/acats/run_all.sh2
2 files changed, 5 insertions, 5 deletions
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