* 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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9bbb196..8d00a73 100644 (file)
--- 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 (executable)
--- 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 (executable)
--- 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