[Pkg-golang-commits] [golang] 01/02: Disable tests on armel.

[Michael Hudson-Doyle]

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

mwhudson-guest pushed a commit to branch golang-1.7
in repository golang.

commit 95e1fe6388d4ce651b53db5dac9a8e3bf08bd62f
Author: Michael Hudson-Doyle <michael.hudson at canonical.com>
Date:   Tue Aug 16 15:18:34 2016 +1200

    Disable tests on armel.
---
 debian/changelog | 6 ++++++
 debian/rules     | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be0994b..eb150c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+golang-1.7 (1.7-2) UNRELEASED; urgency=medium
+
+  * Disable tests on armel.
+
+ -- Michael Hudson-Doyle <michael.hudson at ubuntu.com>  Tue, 16 Aug 2016 15:18:07 +1200
+
 golang-1.7 (1.7-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index c47a7be..754dfcb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,9 @@ export GOVER := $(shell perl -w -mDpkg::Version -e 'Dpkg::Version->new(`dpkg-par
 export GOROOT := $(CURDIR)
 export GOROOT_FINAL := /usr/lib/go-$(GOVER)
 
-DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
 RUN_TESTS := true
-ifeq (ppc64, $(DEB_HOST_ARCH_CPU))
+ifneq (,$(filter armel ppc64,$(DEB_HOST_ARCH)))
 	RUN_TESTS := false
 endif
 ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))

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