From patchwork Wed Jun 29 09:38:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 102542 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 9B564B6F57 for ; Wed, 29 Jun 2011 19:38:50 +1000 (EST) Received: (qmail 14093 invoked by alias); 29 Jun 2011 09:38:47 -0000 Received: (qmail 14078 invoked by uid 22791); 29 Jun 2011 09:38:46 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 29 Jun 2011 09:38:33 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id B26E9549; Wed, 29 Jun 2011 11:38:31 +0200 (CEST) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id g03JSrIZUhf1; Wed, 29 Jun 2011 11:38:30 +0200 (CEST) Received: from manam.CeBiTec.Uni-Bielefeld.DE (manam.CeBiTec.Uni-Bielefeld.DE [129.70.161.120]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id 33F57548; Wed, 29 Jun 2011 11:38:30 +0200 (CEST) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.4+Sun/8.14.4/Submit) id p5T9cTft023853; Wed, 29 Jun 2011 11:38:29 +0200 (MEST) From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: Arnaud Charlet , John David Anglin Subject: [testsuite, ada] Cope with HP-UX sh in run_acats (PR ada/49511) Date: Wed, 29 Jun 2011 11:38:29 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org 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 PR ada/49511 * ada/acats/run_acats (which): Use last field of type -p output. 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