run_acats (which): Extract last field from type -p, type output only if command succe...

	* ada/acats/run_acats (which): Extract last field from type -p,
	type output only if command succeeded.

From-SVN: r175843

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d496dbcdb8220aaa13b87c94b8d90311436262aa..7a4b5bbd3f9910358a62a5d41197685d61fed902 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * ada/acats/run_acats (which): Extract last field from type -p,
+       type output only if command succeeded.
+
 2011-07-04  Jason Merrill  <jason@redhat.com>
 
        * g++.dg/abi/mangle48.C: New.

diff --git a/gcc/testsuite/ada/acats/run_acats b/gcc/testsuite/ada/acats/run_acats
index 5d68e6c223ac9867ceb496925b292336e9a562a3..c1ed39f8555fa84f1fdb534e8f73a3cce984e90e 100755 (executable)
--- a/gcc/testsuite/ada/acats/run_acats
+++ b/gcc/testsuite/ada/acats/run_acats
@@ -14,8 +14,8 @@ fi
 # Fall back to whence which ksh88 and ksh93 provide, but bash does not.
 
 which () {
-    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=`type -p $* 2>/dev/null` && { echo $path | awk '{print $NF}'; return 0; }
+    path=`type $* 2>/dev/null` && { echo $path | awk '{print $NF}'; return 0; }
     path=`whence $* 2>/dev/null` && { echo $path; return 0; }
     return 1
 }