From 8046b665398a63ef95f34d58ffec6a1ba3be1e6f Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 21 Mar 2011 22:01:53 +0000 Subject: [PATCH] libgo: Add GOTESTFLAGS variable used when testing. From Rainer Orth. From-SVN: r171272 --- libgo/Makefile.am | 6 ++++-- libgo/Makefile.in | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libgo/Makefile.am b/libgo/Makefile.am index 0715a9911bf..2db29fdea52 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -1480,6 +1480,8 @@ else use_dejagnu = no endif +GOTESTFLAGS = + # Check a package. CHECK = \ @GC="$(GOC) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs -Wl,-R,`${PWD_COMMAND}`/.libs"; \ @@ -1492,9 +1494,9 @@ CHECK = \ prefix=`if test "$(@D)" = "regexp"; then echo regexp-test; else dirname $(@D); fi`; \ test "$${prefix}" != "." || prefix="$(@D)"; \ if test "$(use_dejagnu)" = "yes"; then \ - $(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)"; \ + $(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" $(GOTESTFLAGS); \ else \ - if $(SHELL) $(srcdir)/testsuite/gotest --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" >>$@-log 2>&1; then \ + if $(SHELL) $(srcdir)/testsuite/gotest --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" $(GOTESTFLAGS) >>$@-log 2>&1; then \ echo "PASS: $(@D)"; \ else \ echo "FAIL: $(@D)"; \ diff --git a/libgo/Makefile.in b/libgo/Makefile.in index c9f01879189..7bb302da913 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -1814,6 +1814,7 @@ BUILDPACKAGE = \ @LIBGO_IS_RTEMS_FALSE@use_dejagnu = no @LIBGO_IS_RTEMS_TRUE@use_dejagnu = yes +GOTESTFLAGS = # Check a package. CHECK = \ @@ -1827,9 +1828,9 @@ CHECK = \ prefix=`if test "$(@D)" = "regexp"; then echo regexp-test; else dirname $(@D); fi`; \ test "$${prefix}" != "." || prefix="$(@D)"; \ if test "$(use_dejagnu)" = "yes"; then \ - $(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)"; \ + $(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" $(GOTESTFLAGS); \ else \ - if $(SHELL) $(srcdir)/testsuite/gotest --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" >>$@-log 2>&1; then \ + if $(SHELL) $(srcdir)/testsuite/gotest --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" $(GOTESTFLAGS) >>$@-log 2>&1; then \ echo "PASS: $(@D)"; \ else \ echo "FAIL: $(@D)"; \ -- 2.30.2