| Message ID | alpine.LFD.2.21.2002280006100.18621@redsun52.ssa.fujisawa.hgst.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fix library testsuite compilation for build sysroot | expand |
On 2020/2/28 9:18 AM, Maciej W. Rozycki wrote: > 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. Hi Maciej, sorry, I didn't notice you were blocked on input from us. I tested our testing with this patch and can confirm it works for us; didn't notice any breakage. Chung-Lin > 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@" >
On Thu, 26 Mar 2020, Chung-Lin Tang wrote: > > 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. > > Hi Maciej, > sorry, I didn't notice you were blocked on input from us. No worries; I'm glad you are all right! > I tested our testing with this patch and can confirm it works for us; > didn't notice any breakage. Thank you! I'll be posting a revised series shortly for a libffi update; no change to the libgomp part on this occasion now that it works for you. Maciej
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@"
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