From patchwork Fri Feb 28 01:18:57 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: 1246244 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-520285-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=qeBgwxF0; 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=ii+y6GCD; 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 48TBX039t8z9sNg for ; Fri, 28 Feb 2020 12:19:12 +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=soS1X1/pKPp1/aI0 i146I4omTtUR0KC+IrSad4JKSYE0QgW8AmFVC/VJGjn780qtb9w0zA4b3QtAJc6U bUfHwUSV2HOwWczbyeX+RPkS1B6DD1LbiiUEFAj+YG+43gPTLFz7K1wgfO3bS5A8 +qbzCgq9fl1QiXXTNDkW/TTFusE= 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=l9rC8FGXx45D8XXNE/67SA h0SvY=; b=qeBgwxF0cBpVScTur+ZVYcVfDkjVmDvlZ1wyWZiUROv8nYgRBcjNkA SgFapMFwMAlxj3GzH4jBlbaxuQiHsSknoqlYe8GRyCq5tptI3MMv20J4zTXNYwVr w6YArenRXYzgi4/7z9+fFeuSzeAkLZcy4KYJsmWE9TMhG9Ko5fm/4= Received: (qmail 37352 invoked by alias); 28 Feb 2020 01:19:05 -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 37344 invoked by uid 89); 28 Feb 2020 01:19:05 -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 autolearn=ham version=3.3.1 spammy= X-HELO: esa1.hgst.iphmx.com Received: from esa1.hgst.iphmx.com (HELO esa1.hgst.iphmx.com) (68.232.141.245) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 28 Feb 2020 01:19:03 +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=1582852743; x=1614388743; h=date:from:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=/UGVFZ4LqDM/CTrWztrstASyp586B0dTci8l8zaItt0=; b=ii+y6GCDzLYxASv4qH4QklbQEx9dkYXYaGRDfnP4ESZVQg/2jstqTob5 US4dnC2j5pmgIDpKQSLtv60KUVsSQS8X6LZXPuKV2/cEOH/lEMkbsNLzp rkrTYlv4la5l9YHaYLB+mtLTPjat9qcnK0jJ3eAJd5lMcIQ8OdypLk5Hi UDFgQtjt8j6vuAhtsL2e7ivqpmNgMPvhIFTcmTnSyKOFDuTxHM5KHOC8s XtRh6iCdKgCdPjVkF/UvqEV/glGuswmpcerqOYChmu8islx9BNyN2rBK4 g7oAUK1aKOiENm5UgmwXdmbtrnQtbF8hfc3IJ4P8xkQQVP+IlAVt22rzk A==; IronPort-SDR: QlgzshRGtzGxSenCAOWFufEWI+lwTQsKdiWCHA0TGSI/iE6YEFJMvEYFse7SgbfnYWxCwDkkpR Bf3BteutxWe1P1U2OOSzjwhMgzwhmQgGEMNTquo44hF3S0zzlSEndjp630zEiN7RI5i30Zeqzj 8KpoRxJoNoxCwbEADVQxjXu3Km6XWWrNlIN9rMNHXGQZjahHYlhpVoR65kxaSbZHUe/w43fOsw WeTM9+JgFH8QxHPSA4n4RZcXE5Q7GUklB479QLngwuFpvkZcBdPWU5K2jmGept2nfE34/0JSLE 3QA= Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 28 Feb 2020 09:19:01 +0800 IronPort-SDR: kM9XJ/9hZVofNtI+crvDpd7cCP6fEUMwrHHXA5IHD6YVDxkVDYrm+GvCYCNHJAFfZagXkoRFLw /imNVViIst1zlbHoA+TQ8GYnoid/LcBtzu4WVUb+sty4YHmNLKFXIhq7fdAXcaQsdSTInBHkbk SrsFztbYiRYwXmvl3uTBnLxhfzEjQBt0NYAgeYBtIz1gGxSmW4znp4nEyhoO6/wlV//wNcj3sr dOYqM2mHM+iEEzFZ3slbRGAmuP0x8+Qs/ycXQu4sSRq0xCGOTyD6AHN3fGJY6K6qdqull1+MkJ WXfwM6inVRnEWi3QL6t70LeQ Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2020 17:11:24 -0800 IronPort-SDR: ZB3Y7d5xcCblu/ILF8uzxsYJaEscl9yfsJhByu7CYl80ZDU9T+D1r35onGk1z0NgtUIgqZO1aG 8ig2FYZfe7R4Blov70jMnCog80MtWz9Beb8TJ6iCfb54nUGpCygRmxXMqOXDs0VJfqoEsa5OA3 I2tQbWjZ83Wi8Sas/BLtS8nXqeysLEyPJFboNwIaNOZA3WwBAcVg5BqbLp0SqXd19wedjlVgEu ZLKMvJz94YcLXaXufgPpo3FxJWNSlEBWf68+kZvcELGQ5+3HJRtW4yeZcpZvXuBJl9cEJLsmel J0w= WDCIronportException: Internal Received: from unknown (HELO redsun52) ([10.149.66.28]) by uls-op-cesaip01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2020 17:19:01 -0800 Date: Fri, 28 Feb 2020 01:18:57 +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 4/4] libgomp/test: Remove a build sysroot fix regression In-Reply-To: Message-ID: References: User-Agent: Alpine 2.21 (LFD 202 2017-01-01) MIME-Version: 1.0 Fix a problem with commit c8e759b4215b ("libgomp/test: Fix compilation for build sysroot") that caused a regression in some standalone test environments where testsuite/libgomp-test-support.exp is used, but the compiler is expected to be determined by `[find_gcc]', and set the GCC_UNDER_TEST TCL variable in testsuite/libgomp-site-extra.exp instead. libgomp/ * configure.ac: Add testsuite/libgomp-site-extra.exp to output files. * configure: Regenerate. * testsuite/libgomp-site-extra.exp.in: New file. * testsuite/libgomp-test-support.exp.in (GCC_UNDER_TEST): Remove variable. * testsuite/Makefile.am (EXTRA_DEJAGNU_SITE_CONFIG): New variable. * testsuite/Makefile.in: Regenerate. --- Changes from v2: - Do not use `--tool_exec' with AM_RUNTESTFLAGS. - Move the definition of GCC_UNDER_TEST from testsuite/libgomp-test-support.exp to testsuite/libgomp-site-extra.exp. Applies on top of v1. --- libgomp/configure | 3 +++ libgomp/configure.ac | 1 + libgomp/testsuite/Makefile.am | 2 ++ libgomp/testsuite/Makefile.in | 6 +++++- libgomp/testsuite/libgomp-site-extra.exp.in | 1 + libgomp/testsuite/libgomp-test-support.exp.in | 2 -- 6 files changed, 12 insertions(+), 3 deletions(-) gcc-test-libgomp-site-extra.diff Index: gcc/libgomp/configure =================================================================== --- gcc.orig/libgomp/configure +++ gcc/libgomp/configure @@ -17047,6 +17047,8 @@ ac_config_files="$ac_config_files Makefi ac_config_files="$ac_config_files testsuite/libgomp-test-support.pt.exp:testsuite/libgomp-test-support.exp.in" +ac_config_files="$ac_config_files testsuite/libgomp-site-extra.exp" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -18200,6 +18202,7 @@ do "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; "libgomp.spec") CONFIG_FILES="$CONFIG_FILES libgomp.spec" ;; "testsuite/libgomp-test-support.pt.exp") CONFIG_FILES="$CONFIG_FILES testsuite/libgomp-test-support.pt.exp:testsuite/libgomp-test-support.exp.in" ;; + "testsuite/libgomp-site-extra.exp") CONFIG_FILES="$CONFIG_FILES testsuite/libgomp-site-extra.exp" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac Index: gcc/libgomp/configure.ac =================================================================== --- gcc.orig/libgomp/configure.ac +++ gcc/libgomp/configure.ac @@ -436,4 +436,5 @@ GCC_BASE_VER AC_CONFIG_FILES(omp.h omp_lib.h omp_lib.f90 libgomp_f.h) AC_CONFIG_FILES(Makefile testsuite/Makefile libgomp.spec) AC_CONFIG_FILES([testsuite/libgomp-test-support.pt.exp:testsuite/libgomp-test-support.exp.in]) +AC_CONFIG_FILES([testsuite/libgomp-site-extra.exp]) AC_OUTPUT Index: gcc/libgomp/testsuite/Makefile.am =================================================================== --- gcc.orig/libgomp/testsuite/Makefile.am +++ gcc/libgomp/testsuite/Makefile.am @@ -12,6 +12,8 @@ _RUNTEST = $(shell if test -f $(top_srcd echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi) RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir +EXTRA_DEJAGNU_SITE_CONFIG = libgomp-site-extra.exp + # Instead of directly in ../testsuite/libgomp-test-support.exp.in, the # following variables have to be "routed through" this Makefile, for expansion # of the several (Makefile) variables used therein. Index: gcc/libgomp/testsuite/Makefile.in =================================================================== --- gcc.orig/libgomp/testsuite/Makefile.in +++ gcc/libgomp/testsuite/Makefile.in @@ -111,7 +111,8 @@ 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 = libgomp-test-support.pt.exp +CONFIG_CLEAN_FILES = libgomp-test-support.pt.exp \ + libgomp-site-extra.exp CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -310,6 +311,7 @@ _RUNTEST = $(shell if test -f $(top_srcd echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi) RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir +EXTRA_DEJAGNU_SITE_CONFIG = libgomp-site-extra.exp all: all-am .SUFFIXES: @@ -344,6 +346,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $( $(am__aclocal_m4_deps): libgomp-test-support.pt.exp: $(top_builddir)/config.status $(srcdir)/libgomp-test-support.exp.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +libgomp-site-extra.exp: $(top_builddir)/config.status $(srcdir)/libgomp-site-extra.exp.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo Index: gcc/libgomp/testsuite/libgomp-site-extra.exp.in =================================================================== --- /dev/null +++ gcc/libgomp/testsuite/libgomp-site-extra.exp.in @@ -0,0 +1 @@ +set GCC_UNDER_TEST {@CC@} Index: gcc/libgomp/testsuite/libgomp-test-support.exp.in =================================================================== --- gcc.orig/libgomp/testsuite/libgomp-test-support.exp.in +++ gcc/libgomp/testsuite/libgomp-test-support.exp.in @@ -1,5 +1,3 @@ -set GCC_UNDER_TEST {@CC@} - set cuda_driver_include "@CUDA_DRIVER_INCLUDE@" set cuda_driver_lib "@CUDA_DRIVER_LIB@" set hsa_runtime_lib "@HSA_RUNTIME_LIB@"