From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa4.hgst.iphmx.com (esa4.hgst.iphmx.com [216.71.154.42]) by sourceware.org (Postfix) with ESMTPS id 96013385DC2C for ; Fri, 3 Apr 2020 23:02:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 96013385DC2C IronPort-SDR: ALfFsGP3depFMvgkqBFUJoz1hZtRv8Rue3ZJdTJdbWiekEV6iyWhZjZAi0aH2paGZEQfw1anwa iieAb2NxNngvZWr+Wemp3xeu5j9QZfhKQwgsczvnuvnxpyE0jt6BB7EofJ94FY26o+FdK/eNYF mtOVvpWx9TD6CgNJ13BCDLZh9VsX7t8o1eC1KzR8xwl2kA+MPMH96pUkj7t0+WjCMYFnEFabc6 HZecudCsB25syhtsbQRv2rD9Gv6bvqHT7B+jywSh8Pd5sAIlgLBR6jDnM7aOY1+t0MpVqaRMMT qlI= X-IronPort-AV: E=Sophos;i="5.72,341,1580745600"; d="scan'208";a="134547531" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 04 Apr 2020 07:02:02 +0800 IronPort-SDR: 6BOZ0PwcmE0V0zMUd/4iTu4GBy1DVPMEXeJJx7SU8LIQDQgxcEMtWDx+GGJn9W7ZcL+rGGHKA8 bddJdWlEdsol7OJgM2EMS+BY61W3PDkkT5MbIcGLCXdFpW5rrRda35+6d3XxEW9aQGnG0z+olA S+Wqubwq/poHQdhxRnsy7rAWOgEkJ8cIAwLwZZ1tbkSrFyLU/0TOlEuxavrllxgDAY/UsfXJSt +gaVMmSKn5I/UH0iMbLnsQnMy+GnNiJtZPUDrg/CMys5hGD0J4pD9w/TcE92TUmmBNU+eyOTdc 8VTJD9Ijj+jTorY5IH2aw9tY Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Apr 2020 15:52:51 -0700 IronPort-SDR: 9nWl8uXLPofud8+5CN/xOA1QUcaaIIwaL2fc/fWHFXSH4yTKUhT1FuN64opb6LZcS7dKtUktBT XoRy8inL6ZFTMmJFaEyQA2I1KiXKUjy5UOnYsssJWb5hZIvfvH3o163kCYwWqWHHbhu00Iy558 wCD9sGNOfdC4DELnhUD/VWiKvCKC5jMPQaVd63dW75EeKkaNsDJSEIMKBnnE3h+R1ZJ+ht1JKs Mtq66kfzzbpRrk1ovlh0rJ9l+CjKvumyoyLlw9CmW+Xmcu3LLThw82BCxv8zLKseCmI90sQZQZ PKU= 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; 03 Apr 2020 16:02:02 -0700 Date: Sat, 4 Apr 2020 00:01:59 +0100 (BST) From: "Maciej W. Rozycki" To: gcc-patches@gcc.gnu.org cc: Jeff Law , Mike Stump , Chung-Lin Tang , Ian Lance Taylor Subject: [PATCH v4 5/5] 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 Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Apr 2020 23:02:05 -0000 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. --- No changes from v3. 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@"