[gcc-7] 289/354: * Enable libgo tests and rebuilds with make -C (Svante Signell). Closes: #873929.

Ximin Luo infinity0 at debian.org
Thu Nov 23 15:51:19 UTC 2017 

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit e321e2f50acf3663846c00111c2d6442ebcca95c
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue Sep 12 19:29:06 2017 +0000

      * Enable libgo tests and rebuilds with make -C (Svante Signell).
        Closes: #873929.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9671 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                     |  2 ++
 debian/patches/libgo-cleanfiles.diff | 31 ++++++++++++++++++++
 debian/patches/libgo-testsuite.diff  | 56 ++++++++++++++++++++++++++++--------
 debian/rules.patch                   |  1 +
 4 files changed, 78 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6683ce3..25b1049 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ gcc-7 (7.2.0-5) UNRELEASED; urgency=medium
       PR target/80695 (PPC), PR target/81988 (SPARC), PR middle-end/81768,
       PR sanitizer/81923, PR target/81621, PR driver/81650,
       PR middle-end/81052, PR tree-optimization/81987, PR bootstrap/81926.
+  * Enable libgo tests and rebuilds with make -C (Svante Signell).
+    Closes: #873929.
 
  -- Matthias Klose <doko at debian.org>  Tue, 12 Sep 2017 10:27:32 +0200
 
diff --git a/debian/patches/libgo-cleanfiles.diff b/debian/patches/libgo-cleanfiles.diff
new file mode 100644
index 0000000..1bfb31a
--- /dev/null
+++ b/debian/patches/libgo-cleanfiles.diff
@@ -0,0 +1,31 @@
+Index: gcc-7-7.2.0/src/libgo/Makefile.am
+===================================================================
+--- gcc-7-7.2.0.orig/src/libgo/Makefile.am
++++ gcc-7-7.2.0/src/libgo/Makefile.am
+@@ -1423,7 +1423,9 @@ mostlyclean-local:
+ 	find . -name '*-testsum' -print | xargs rm -f
+ 	find . -name '*-testlog' -print | xargs rm -f
+ 
+-CLEANFILES = *.go *.gox goc2c *.c s-version libgo.sum libgo.log
++CLEANFILES = *.go *.gox goc2c *.c s-* libgo.sum libgo.log \
++	*.dep */*.dep */*/*.dep */*/*/*.dep */*/*.dep */*/*/*/*.dep \
++	*/*/*/*/*/*.dep
+ 
+ clean-local:
+ 	find . -name '*.la' -print | xargs $(LIBTOOL) --mode=clean rm -f
+Index: gcc-7-7.2.0/src/libgo/Makefile.in
+===================================================================
+--- gcc-7-7.2.0.orig/src/libgo/Makefile.in
++++ gcc-7-7.2.0/src/libgo/Makefile.in
+@@ -1347,7 +1347,10 @@ TEST_PACKAGES = \
+ 	unicode/utf8/check
+ 
+ MOSTLYCLEAN_FILES = libgo.head libgo.sum.sep libgo.log.sep
+-CLEANFILES = *.go *.gox goc2c *.c s-version libgo.sum libgo.log
++CLEANFILES = *.go *.gox goc2c *.c s-* libgo.sum libgo.log \
++	*.dep */*.dep */*/*.dep */*/*/*.dep */*/*.dep */*/*/*/*.dep \
++	*/*/*/*/*/*.dep
++
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
diff --git a/debian/patches/libgo-testsuite.diff b/debian/patches/libgo-testsuite.diff
index 7f5584d..42bb3f4 100644
--- a/debian/patches/libgo-testsuite.diff
+++ b/debian/patches/libgo-testsuite.diff
@@ -1,38 +1,70 @@
 # DP: Only run the libgo testsuite for flags configured in RUNTESTFLAGS
 
-Index: b/src/libgo/Makefile.am
+Index: gcc-7-7.2.0/src/libgo/Makefile.am
 ===================================================================
---- a/src/libgo/Makefile.am
-+++ b/src/libgo/Makefile.am
-@@ -948,7 +948,12 @@ CHECK = \
+--- gcc-7-7.2.0.orig/src/libgo/Makefile.am
++++ gcc-7-7.2.0/src/libgo/Makefile.am
+@@ -929,7 +929,7 @@ BUILDGOX = \
+ 	$(SHELL) $(srcdir)/mvifdiff.sh $@.tmp `echo $@ | sed -e 's/s-gox/gox/'`
+ 
+ GOTESTFLAGS =
+-GOBENCH = 
++GOBENCH =
+ 
+ # Check a package.
+ CHECK = \
+@@ -948,6 +948,12 @@ CHECK = \
  	$(MKDIR_P) $(@D); \
  	rm -f $@-testsum $@-testlog; \
  	files=`$(SHELL) $(srcdir)/match.sh --goarch=$(GOARCH) --goos=$(GOOS) --srcdir=$(srcdir)/go/$(@D) --extrafiles="$(extra_go_files_$(subst /,_,$(@D)))" $(matchargs_$(subst /,_,$(@D)))`; \
--	if test "$(USE_DEJAGNU)" = "yes"; then \
 +	run_check=yes; \
 +	MULTILIBDIR="$(MULTILIBDIR)"; \
 +	case "$$MULTILIBDIR" in /64|/x32) \
 +	  echo "$$RUNTESTFLAGS" | grep -q "$${MULTILIBDIR\#/*}" || run_check=; \
 +	esac; \
 +	if test "$$run_check" = "yes"; then \
+ 	if test "$(USE_DEJAGNU)" = "yes"; then \
  	  $(SHELL) $(srcdir)/testsuite/gotest --goarch=$(GOARCH) --goos=$(GOOS) --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$$files" --testname="$(@D)" $(GOTESTFLAGS); \
  	elif test "$(GOBENCH)" != ""; then \
- 	  $(SHELL) $(srcdir)/testsuite/gotest --goarch=$(GOARCH) --goos=$(GOOS) --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$$files" --bench="$(GOBENCH)" $(GOTESTFLAGS); \
-Index: b/src/libgo/Makefile.in
+@@ -963,6 +969,7 @@ CHECK = \
+ 	    echo "FAIL: $(@D)" > $@-testsum; \
+ 	    exit 1; \
+ 	  fi; \
++	fi; \
+ 	fi
+ 
+ # Build all packages before checking any.
+Index: gcc-7-7.2.0/src/libgo/Makefile.in
 ===================================================================
---- a/src/libgo/Makefile.in
-+++ b/src/libgo/Makefile.in
-@@ -1104,7 +1104,12 @@ CHECK = \
+--- gcc-7-7.2.0.orig/src/libgo/Makefile.in
++++ gcc-7-7.2.0/src/libgo/Makefile.in
+@@ -1085,7 +1085,7 @@ BUILDGOX = \
+ 	$(SHELL) $(srcdir)/mvifdiff.sh $@.tmp `echo $@ | sed -e 's/s-gox/gox/'`
+ 
+ GOTESTFLAGS = 
+-GOBENCH = 
++GOBENCH =
+ 
+ # Check a package.
+ CHECK = \
+@@ -1104,6 +1104,12 @@ CHECK = \
  	$(MKDIR_P) $(@D); \
  	rm -f $@-testsum $@-testlog; \
  	files=`$(SHELL) $(srcdir)/match.sh --goarch=$(GOARCH) --goos=$(GOOS) --srcdir=$(srcdir)/go/$(@D) --extrafiles="$(extra_go_files_$(subst /,_,$(@D)))" $(matchargs_$(subst /,_,$(@D)))`; \
--	if test "$(USE_DEJAGNU)" = "yes"; then \
 +	run_check=yes; \
 +	MULTILIBDIR="$(MULTILIBDIR)"; \
 +	case "$$MULTILIBDIR" in /64|/x32) \
 +	  echo "$$RUNTESTFLAGS" | grep -q "$${MULTILIBDIR\#/*}" || run_check=; \
 +	esac; \
 +	if test "$$run_check" = "yes"; then \
+ 	if test "$(USE_DEJAGNU)" = "yes"; then \
  	  $(SHELL) $(srcdir)/testsuite/gotest --goarch=$(GOARCH) --goos=$(GOOS) --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$$files" --testname="$(@D)" $(GOTESTFLAGS); \
  	elif test "$(GOBENCH)" != ""; then \
- 	  $(SHELL) $(srcdir)/testsuite/gotest --goarch=$(GOARCH) --goos=$(GOOS) --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$$files" --bench="$(GOBENCH)" $(GOTESTFLAGS); \
+@@ -1119,6 +1125,7 @@ CHECK = \
+ 	    echo "FAIL: $(@D)" > $@-testsum; \
+ 	    exit 1; \
+ 	  fi; \
++	fi; \
+ 	fi
+ 
+ 
diff --git a/debian/rules.patch b/debian/rules.patch
index f045bca..23e3b96 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -54,6 +54,7 @@ debian_patches += \
 	libgomp-omp_h-multilib \
 	pr47818 \
 	libgo-testsuite \
+	libgo-cleanfiles \
 	gcc-target-include-asm \
 	libgo-revert-timeout-exp \
 	libgo-setcontext-config \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git

More information about the Reproducible-commits mailing list