From f7069d58f6b79b685000544981eb4d05d8261bf9 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Thu, 30 Jun 2011 10:04:52 +0000 Subject: [PATCH] re PR ada/49511 (acats test setup fails on HP-UX using posix shell) PR ada/49511 * ada/acats/run_acats (which): Use last field of type -p output. From-SVN: r175690 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/ada/acats/run_acats | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 985426f3d53..870619a8fba 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-06-30 Rainer Orth + + PR ada/49511 + * ada/acats/run_acats (which): Use last field of type -p output. + 2011-06-30 Dominique d'Humieres Iain Sandoe diff --git a/gcc/testsuite/ada/acats/run_acats b/gcc/testsuite/ada/acats/run_acats index bb68e62bf8a..5d68e6c223a 100755 --- a/gcc/testsuite/ada/acats/run_acats +++ b/gcc/testsuite/ada/acats/run_acats @@ -10,11 +10,11 @@ fi # 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. +# type -p is present. Unfortunately, HP-UX /bin/sh ignores -p with type. # Fall back to whence which ksh88 and ksh93 provide, but bash does not. which () { - path=`type -p $* 2>/dev/null` && { echo $path; return 0; } + path=`type -p $* 2>/dev/null | awk '{print $NF}'` && { echo $path; return 0; } path=`type $* 2>/dev/null | awk '{print $NF}'` && { echo $path; return 0; } path=`whence $* 2>/dev/null` && { echo $path; return 0; } return 1 -- 2.30.2