diff mbox

[testsuite,ada] Cope with HP-UX sh in run_acats (PR ada/49511)

Message ID yddaad13rl6.fsf@manam.CeBiTec.Uni-Bielefeld.DE
State New
Headers show

Commit Message

Rainer Orth June 29, 2011, 9:38 a.m. UTC 
As described in the PR, HP-UX /bin/sh type -p ignores the -p, so we need
to extract the last field of the output just as for regular type.  The
following patch does this, tested by Dave and bootstrapped on
sparc-sun-solaris2.11.

Ok for mainline, 4.6 and 4.5 branches?

Thanks.
        Rainer


2011-06-29  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	PR ada/49511
	* ada/acats/run_acats (which): Use last field of type -p output.

Comments

Arnaud Charlet June 29, 2011, 5:46 p.m. UTC | #1 
> As described in the PR, HP-UX /bin/sh type -p ignores the -p, so we need
> to extract the last field of the output just as for regular type.  The
> following patch does this, tested by Dave and bootstrapped on
> sparc-sun-solaris2.11.
> 
> Ok for mainline, 4.6 and 4.5 branches?

OK
diff mbox

Patch

diff --git a/gcc/testsuite/ada/acats/run_acats b/gcc/testsuite/ada/acats/run_acats
--- 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