From patchwork Fri Jun 22 11:38:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 933283 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-480281-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="pupmxbop"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41BxRR3rlpz9s4b for ; Fri, 22 Jun 2018 21:38:59 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=akCyw5oFuuSFMCtJBJDSO0Nn/WUpI7yizb8C/K6tV5JAU9YiwW xJzK2Uu9z0+0Ym1RKewYi/ZyDAE2O2fuI+bnFxiJ86tk4+xRcQTscptYWbKlChtK 3kPBPP4PTsFimPbJgWL5kqjaJaaKX45vOCO/pT0H1tTY7x+bRRCyHgQSA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=QEFd+VY5FemPUhCHRKM1sIpe0io=; b=pupmxbophu0HGX6phAQC TtTdgHfhQ14b16DRdhuPCK36grR0+c2s+ddBjMQ1gOVISk8GbKHGh6RWt+kb/5iR cIPXO/491k9Cs4IEM9yWAnhkNnskMtD8PvdLOUpapyL/THew/1B7Zr8F+qw6McKY oOl8offekT5mI0Tzca2fOTI= Received: (qmail 124438 invoked by alias); 22 Jun 2018 11:38:51 -0000 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 Received: (qmail 124403 invoked by uid 89); 22 Jun 2018 11:38:50 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy=quality X-HELO: mx2.suse.de Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 22 Jun 2018 11:38:49 +0000 Received: from relay2.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id BD65BAD97; Fri, 22 Jun 2018 11:38:47 +0000 (UTC) Date: Fri, 22 Jun 2018 13:38:47 +0200 From: Tom de Vries To: gcc-patches@gcc.gnu.org Cc: Mike Stump , Rainer Orth Subject: [PATCH][testsuite/guality] Use buildarea gdb by default in combined build Message-ID: <20180622113844.khqce7mpjamjw7pi@localhost.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20170912 (1.9.0) X-IsSubscribed: yes Hi, when doing a combined build of gcc and binutils-gdb repos, guality still uses the gdb in PATH by default. This patch makes sure that quality uses the gdb from the combined build instead. Tested on x86_64. OK for trunk? Thanks, - Tom [testsuite/guality] Use buildarea gdb by default in combined build 2018-06-22 Tom de Vries * g++.dg/guality/guality.exp (guality_gdb_name): Default to $rootme/../gdb/gdb, if available. * gcc.dg/guality/guality.exp (guality_gdb_name): Same. * gfortran.dg/guality/guality.exp (guality_gdb_name): Same. --- gcc/testsuite/g++.dg/guality/guality.exp | 3 +++ gcc/testsuite/gcc.dg/guality/guality.exp | 3 +++ gcc/testsuite/gfortran.dg/guality/guality.exp | 3 +++ 3 files changed, 9 insertions(+) diff --git a/gcc/testsuite/g++.dg/guality/guality.exp b/gcc/testsuite/g++.dg/guality/guality.exp index 72f23c8cca7..e5eaceedc9a 100644 --- a/gcc/testsuite/g++.dg/guality/guality.exp +++ b/gcc/testsuite/g++.dg/guality/guality.exp @@ -38,6 +38,9 @@ global GDB if ![info exists ::env(GUALITY_GDB_NAME)] { if [info exists GDB] { set guality_gdb_name "$GDB" + } elseif [file exists $rootme/../gdb/gdb] { + # If we're doing a combined build, and gdb is available, use it. + set guality_gdb_name "$rootme/../gdb/gdb" } else { set guality_gdb_name "[transform gdb]" } diff --git a/gcc/testsuite/gcc.dg/guality/guality.exp b/gcc/testsuite/gcc.dg/guality/guality.exp index 7eebd27b544..2a90ec3c8c8 100644 --- a/gcc/testsuite/gcc.dg/guality/guality.exp +++ b/gcc/testsuite/gcc.dg/guality/guality.exp @@ -38,6 +38,9 @@ global GDB if ![info exists ::env(GUALITY_GDB_NAME)] { if [info exists GDB] { set guality_gdb_name "$GDB" + } elseif [file exists $rootme/../gdb/gdb] { + # If we're doing a combined build, and gdb is available, use it. + set guality_gdb_name "$rootme/../gdb/gdb" } else { set guality_gdb_name "[transform gdb]" } diff --git a/gcc/testsuite/gfortran.dg/guality/guality.exp b/gcc/testsuite/gfortran.dg/guality/guality.exp index 62875fd54b8..3784cac1ef3 100644 --- a/gcc/testsuite/gfortran.dg/guality/guality.exp +++ b/gcc/testsuite/gfortran.dg/guality/guality.exp @@ -19,6 +19,9 @@ global GDB if ![info exists ::env(GUALITY_GDB_NAME)] { if [info exists GDB] { set guality_gdb_name "$GDB" + } elseif [file exists $rootme/../gdb/gdb] { + # If we're doing a combined build, and gdb is available, use it. + set guality_gdb_name "$rootme/../gdb/gdb" } else { set guality_gdb_name "[transform gdb]" }