[Pkg-golang-commits] [golang] 01/01: Remove inconsistently included race-built packages (Closes: #807294)

[Tianon Gravi]

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

tianon pushed a commit to branch debian-sid
in repository golang.

commit 49ca2e1e09b16543f41f9c08c0c30e40377ed357
Author: Tianon Gravi <tianon at debian.org>
Date:   Mon Feb 29 15:30:20 2016 -0800

    Remove inconsistently included race-built packages (Closes: #807294)
---
 debian/changelog | 1 +
 debian/rules     | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 29a184e..8af7c61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ golang (2:1.6-1) UNRELEASED; urgency=medium
     (Closes: #807290)
   * Trim Build-Depends (Closes: #807299)
   * Fix several minor debian/copyright issues (Closes: #807304)
+  * Remove inconsistently included race-built packages (Closes: #807294)
 
   [ Tianon Gravi ]
   * Add "-k" to "run.bash" invocation so that we do a full test run every time
diff --git a/debian/rules b/debian/rules
index 1589bb7..d3ff260 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,14 @@ ifeq (true, $(RUN_TESTS))
 		bash run.bash -k -no-rebuild;
 	# -k           keep going even when error occurred
 	# -no-rebuild  don't rebuild std and cmd packages
+
+	# On linux/amd64 run.bash installs some race enabled standard library
+	# packages. Delete them again to avoid accidentally including them in
+	# the package.
+	set -ex; \
+		export PATH="$(GOROOT)/bin:$$PATH"; \
+		eval "$$(go tool dist env)"; \
+		rm -rf "$(GOROOT)/pkg/$${GOOS}_$${GOARCH}_race/"
 else
 	# skip the tests on platforms where they fail
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang.git