diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-05-03 16:40:54 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-05-03 16:40:54 +0000 |
| commit | 6b98add918ea6c9ecee7d58ead51e6b1157dc290 (patch) | |
| tree | 18c4d20be0718748467fe8219ead9030e05d5a8f /gcc | |
| parent | b79dc18ae87999996a7b365f056c73011f2b3388 (diff) | |
| download | gcc-6b98add918ea6c9ecee7d58ead51e6b1157dc290.tar.gz | |
* ada/acats/run_acats (which): New function.
(host_gnatchop, host_gnatmake): Use it.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158994 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rwxr-xr-x | gcc/testsuite/ada/acats/run_acats | 19 |
2 files changed, 22 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 019661ec8e0..fb25dc4f110 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-05-03 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * ada/acats/run_acats (which): New function. + (host_gnatchop, host_gnatmake): Use it. + 2010-05-03 Richard Guenther <rguenther@suse.de> PR tree-optimization/43971 diff --git a/gcc/testsuite/ada/acats/run_acats b/gcc/testsuite/ada/acats/run_acats index 3c3d89908f6..c389e647422 100755 --- a/gcc/testsuite/ada/acats/run_acats +++ b/gcc/testsuite/ada/acats/run_acats @@ -5,10 +5,25 @@ if [ "$testdir" = "" ]; then exit 1 fi +# Provide which replacement. +# +# type -p is missing from Solaris 2 /bin/sh and /bin/ksh (ksh88), but both +# ksh93 and bash have it. +# type output format differs between ksh88 and ksh93, so avoid it if +# type -p is present. +# Fall back to whence which ksh88 and ksh93 provide, but bash does not. + +which () { + type -p $* 2>/dev/null && return 0 + type $* 2>/dev/null | awk '{print $3}' && return 0 + whence $* 2>/dev/null && return 0 + return 1 +} + # Set up environment to use the Ada compiler from the object tree -host_gnatchop=`type gnatchop | awk '{print $3}'` -host_gnatmake=`type gnatmake | awk '{print $3}'` +host_gnatchop=`which gnatchop` +host_gnatmake=`which gnatmake` ROOT=`${PWDCMD-pwd}` BASE=`cd $ROOT/../../..; ${PWDCMD-pwd}` |