From patchwork Fri Feb 28 01:18:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 1246243 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-520284-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha1 header.s=default header.b=lVGYcUVO; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=XH0CPhiW; 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 48TBWc5R48z9sNg for ; Fri, 28 Feb 2020 12:18:52 +1100 (AEDT) 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:in-reply-to:message-id:references :mime-version:content-type; q=dns; s=default; b=s2fCNqGYyuDIOH1L e/xbSfMWfJP7e5HO2WvpNKWbfj9JTsv0q/AjY7OuvZPfVk3UowuIvGJqfpK/CyMB j+E8N83nVDLAopTuoKtCZBvTgE1rm5Tm3QBGKiBEuUGC3QJt/qdgZj47/VY9Ch/h YRfwVcE2gab/DMRrNpEjG/MoMuQ= 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:in-reply-to:message-id:references :mime-version:content-type; s=default; bh=paf3dayux8ufxSLQ84J63S YjuH8=; b=lVGYcUVOzhHe4WEwfoVsc/ES4FqkOowe5EFjh1N8y7vkb5JsRb5Hob IRBe8HM+zcGVR/mW6pYseE9AkpuHESSXrwJFJVB7o0psafDB6+XIOqpNzevQjhPv XB7Z+vtwcj8goThbUCSKrMfOQDupomNL/6xrU0jvV7tLs87biwwME= Received: (qmail 35887 invoked by alias); 28 Feb 2020 01:18:44 -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 35871 invoked by uid 89); 28 Feb 2020 01:18:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-8.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, KAM_SHORT autolearn=ham version=3.3.1 spammy= X-HELO: esa6.hgst.iphmx.com Received: from esa6.hgst.iphmx.com (HELO esa6.hgst.iphmx.com) (216.71.154.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 28 Feb 2020 01:18:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1582852721; x=1614388721; h=date:from:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=+F+XnNwMpsfMW4/SMrK5bqZMIq7LnqHzu8SubrDNGSA=; b=XH0CPhiWJ1I/zy+J8GUfHx9xlORLFwWJ8phnpOd8pq0Zru79R27WBdvC zdtpgc1XF0DNm/2dklWbg4oKgS9bFW5PRaKl86n6huaKDSs9ZDQ2D/lMe o8TqEMxLh8Oavih0M515/YPOTyRa6JZeW3iqV8VUKo8NlIfr08syp39XV okA5ToK+XFykUKSyPDyYOEVvaiDB/0SRPcDeRrcty37CUuj/BDWiNj2Eg QzMTTnUW3uk0BZ6oiPbpHn96E+L4wRqw2dRe8qIe/OldrAEeF0jqsBlG/ NClK8v6jvOaWhaGuY2sqNc94oTkswLarEhQ4e78YLE7O1dqwHNO4hdbbp w==; IronPort-SDR: gth/hpiVQMRQPivQhzYcjIRiCt3l7Kx1GEuYXw1QPjJPHnZI8Ce2Gvi9zMO2bNoPsde1NgOs/6 nesj6fl3c3berz1fE5ETw7JzIHhV+ue6KQw4MwZpDX/5953+hfhiNImHcb5HKFJz/d63WxYidz frHZamhJUPe0iCMlZDdgzk6cPAvquwqNlDBJzMLuEzNsvM6buVG21eCPQCPwg7w/BTLa31C2aX +Zta7vNIqRzKmHa1XW7llxx1vVKFDYhdmHKh0ZRq0TihyUq2gRbcxKKPofxN0gg/fHx/Edg4rM i5c= Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 28 Feb 2020 09:18:39 +0800 IronPort-SDR: 7yrs7yhA+thcx1reEAman946xqejCODQ3hM8yZkQak+hLh3u4PWpo2SDjcT9elz9ko6ZeYnYRO 8Grq7ouTrKLCpfPV+m9M9VVXPlX3zJulsSVmn0JJFA4BS95udtHTxGRPCqOJLCd9p40kLtmafk TNQiFlfwiT6BsP7IsIWHt5NVWMjZG3nEcnC0yWDPv9ryzcnlumtrYz0p6yCGxq2NxQsrARRFSB Pm+9tJ8Zq2u1imrI8ZpKJqIlxzyQ0QvvWiv1RBb+tFsv/whl9+GPFQ6FDlKUDvUx2jQvGF+2CF avlL4wuQxIix45nSbgbwUTeT Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2020 17:10:38 -0800 IronPort-SDR: iXtgNbx5MtoIHEJmxMKJmB0IlQ+KsuTfdMJQOFFy2sKiUTI+v2lC8twC3InnKYcZgN3/YHx7+q lbXI5yGa66A8ly7ou0xDqiY3qg2zDlVHYl+f5i3ofARpc3zmOh/cY7+9WcQYIdvysSQakdm1ZW 3oIz8942a3GMgFJiz4l6mSQm6qXHccd2HwfvzZewBJ9HYCaX3CVoFSiQe3uCQizgejTjyWgn2H jjDfR5CNHytQOllZhNo5vKiLweb+fiUaxldAI1FsQVsnIDBsqNW++gOYY9r8qIGHOyf5SKsvB6 LSw= WDCIronportException: Internal Received: from unknown (HELO redsun52) ([10.149.66.28]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2020 17:18:36 -0800 Date: Fri, 28 Feb 2020 01:18:34 +0000 (GMT) From: "Maciej W. Rozycki" To: gcc-patches@gcc.gnu.org cc: Julian Brown , Tobias Burnus , Jeff Law , Thomas Schwinge , Mike Stump , Chung-Lin Tang , Ian Lance Taylor Subject: [PATCH v3 3/4] libgo/test: Complement compilation fix for build sysroot In-Reply-To: Message-ID: References: User-Agent: Alpine 2.21 (LFD 202 2017-01-01) MIME-Version: 1.0 Complement commit b72813a68c94 ("libgo: fix DejaGNU testsuite compiler when using build sysroot") and move testsuite/libgo-test-support.exp.in to testsuite/libgo-site-extra.exp.in. Update testsuite/lib/libgo.exp to handle the `--tool_exec' option to `runtest' as with other top-level GCC target libraries, by using the TOOL_EXECUTABLE TCL variable. libgo/ * configure.ac: Produce testsuite/libgo-site-extra.exp rather than testsuite/libgo-test-support.exp. * configure: Regenerate. * testsuite/libgo-test-support.exp.in: Rename file to... * testsuite/libgo-site-extra.exp.in: ... this. * testsuite/Makefile.am: Use libgo-site-extra.exp rather than libgo-test-support.exp. * testsuite/Makefile.in: Regenerate. * testsuite/lib/libgo.exp: Handle TOOL_EXECUTABLE. --- Changes from v2: - Rename testsuite/libgo-test-support.exp.in to testsuite/libgo-site-extra.exp.in. Applies on top of v1. --- libgo/configure | 4 ++-- libgo/configure.ac | 2 +- libgo/testsuite/Makefile.am | 2 +- libgo/testsuite/Makefile.in | 6 +++--- libgo/testsuite/lib/libgo.exp | 12 ++++++++---- libgo/testsuite/libgo-site-extra.exp.in | 17 +++++++++++++++++ libgo/testsuite/libgo-test-support.exp.in | 17 ----------------- 7 files changed, 32 insertions(+), 28 deletions(-) gcc-test-libgo-site-extra.diff Index: gcc/libgo/configure =================================================================== --- gcc.orig/libgo/configure +++ gcc/libgo/configure @@ -15880,7 +15880,7 @@ else multilib_arg= fi -ac_config_files="$ac_config_files Makefile testsuite/Makefile testsuite/libgo-test-support.exp" +ac_config_files="$ac_config_files Makefile testsuite/Makefile testsuite/libgo-site-extra.exp" ac_config_commands="$ac_config_commands default" @@ -17061,7 +17061,7 @@ do "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; - "testsuite/libgo-test-support.exp") CONFIG_FILES="$CONFIG_FILES testsuite/libgo-test-support.exp" ;; + "testsuite/libgo-site-extra.exp") CONFIG_FILES="$CONFIG_FILES testsuite/libgo-site-extra.exp" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; Index: gcc/libgo/configure.ac =================================================================== --- gcc.orig/libgo/configure.ac +++ gcc/libgo/configure.ac @@ -889,7 +889,7 @@ else multilib_arg= fi -AC_CONFIG_FILES(Makefile testsuite/Makefile testsuite/libgo-test-support.exp) +AC_CONFIG_FILES(Makefile testsuite/Makefile testsuite/libgo-site-extra.exp) AC_CONFIG_COMMANDS([default], [if test -n "$CONFIG_FILES"; then Index: gcc/libgo/testsuite/Makefile.am =================================================================== --- gcc.orig/libgo/testsuite/Makefile.am +++ gcc/libgo/testsuite/Makefile.am @@ -11,7 +11,7 @@ RUNTEST = `if [ -f $(top_srcdir)/../deja echo $(top_srcdir)/../dejagnu/runtest ; \ else echo runtest; fi` -EXTRA_DEJAGNU_SITE_CONFIG = libgo-test-support.exp +EXTRA_DEJAGNU_SITE_CONFIG = libgo-site-extra.exp # When running the tests we set GCC_EXEC_PREFIX to the install tree so that # files that have already been installed there will be found. The -B option Index: gcc/libgo/testsuite/Makefile.in =================================================================== --- gcc.orig/libgo/testsuite/Makefile.in +++ gcc/libgo/testsuite/Makefile.in @@ -107,7 +107,7 @@ am__configure_deps = $(am__aclocal_m4_de DIST_COMMON = $(srcdir)/Makefile.am mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = libgo-test-support.exp +CONFIG_CLEAN_FILES = libgo-site-extra.exp CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -300,7 +300,7 @@ RUNTEST = `if [ -f $(top_srcdir)/../deja echo $(top_srcdir)/../dejagnu/runtest ; \ else echo runtest; fi` -EXTRA_DEJAGNU_SITE_CONFIG = libgo-test-support.exp +EXTRA_DEJAGNU_SITE_CONFIG = libgo-site-extra.exp # When running the tests we set GCC_EXEC_PREFIX to the install tree so that # files that have already been installed there will be found. The -B option @@ -340,7 +340,7 @@ $(top_srcdir)/configure: @MAINTAINER_MOD $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -libgo-test-support.exp: $(top_builddir)/config.status $(srcdir)/libgo-test-support.exp.in +libgo-site-extra.exp: $(top_builddir)/config.status $(srcdir)/libgo-site-extra.exp.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: Index: gcc/libgo/testsuite/lib/libgo.exp =================================================================== --- gcc.orig/libgo/testsuite/lib/libgo.exp +++ gcc/libgo/testsuite/lib/libgo.exp @@ -17,11 +17,15 @@ set TESTING_IN_BUILD_TREE 1 if ![info exists GOC_UNDER_TEST] then { - set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a] - if {$gccdir != ""} { - set gccdir [file dirname $gccdir] + if [info exists TOOL_EXECUTABLE] { + set GOC_UNDER_TEST $TOOL_EXECUTABLE + } else { + set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a] + if {$gccdir != ""} { + set gccdir [file dirname $gccdir] + } + set GOC_UNDER_TEST "$gccdir/gccgo -B$gccdir/" } - set GOC_UNDER_TEST "$gccdir/gccgo -B$gccdir/" } if [info exists GOTEST_TMPDIR] { Index: gcc/libgo/testsuite/libgo-site-extra.exp.in =================================================================== --- /dev/null +++ gcc/libgo/testsuite/libgo-site-extra.exp.in @@ -0,0 +1,17 @@ +# Copyright (C) 2019 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GCC; see the file COPYING3. If not see +# . + +set GOC_UNDER_TEST {@GOC@} Index: gcc/libgo/testsuite/libgo-test-support.exp.in =================================================================== --- gcc.orig/libgo/testsuite/libgo-test-support.exp.in +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2019 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GCC; see the file COPYING3. If not see -# . - -set GOC_UNDER_TEST {@GOC@}