[SCM] Packaging for Google Go branch, debian-sid, updated. debian/2%1-3-8-g8f6a836

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 1e8d8c088abeab67c5216b4e1dccc77f0e59b797
Author: Ondřej Surý <ondrej at sury.org>
Date:   Sun Apr 15 12:30:52 2012 +0200

    Rewrite test conditions to make them more readable (and fix the nochecks)

diff --git a/debian/rules b/debian/rules
index 4566f32..fe475c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,13 @@ override_dh_auto_clean:
 override_dh_auto_build: debian/build.stamp
 
 override_dh_auto_test:
-	$(no_check) || { cd $(CURDIR)/src && mkdir $(CURDIR)/debian/home && HOME=$(CURDIR)/debian/home $(CURDIR)/debian/test.bash $(GOROOT)/pkg/tool/$(GOHOSTOS)_$(GOHOSTARCH); }
+ifeq ($(RUN_TEST), true)
+	cd $(CURDIR)/src && \
+	mkdir $(CURDIR)/debian/home && \
+	HOME=$(CURDIR)/debian/home $(CURDIR)/debian/test.bash $(GOROOT)/pkg/tool/$(GOHOSTOS)_$(GOHOSTARCH);
+else
+	:
+endif
 
 override_dh_compress:
 	dh_compress -Xusr/share/doc/$(PACKAGE)-doc/html -Xusr/share/doc/$(PACKAGE)-doc/godoc
@@ -49,7 +55,7 @@ debian/build.stamp:
 	>debian/build.stamp
 
 opt_no_act =
-no_check = ! :
+RUN_TEST := true
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
     $(warning no support for disabling optimization)
@@ -60,7 +66,7 @@ ifneq (,$(findstring n,$(MAKEFLAGS)))
 endif
 
 ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-    no_check = :
+    RUN_TEST := false
 endif
 
 GOROOT := $(CURDIR)
@@ -75,6 +81,7 @@ DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS 2>/dev/null)
 DEB_BUILD_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null)
 
 ifeq ($(DEB_BUILD_ARCH_OS), kfreebsd)
+    RUN_TEST := false
     GOHOSTOS := freebsd
 else ifeq ($(DEB_BUILD_ARCH_OS), linux)
     GOHOSTOS := linux
@@ -83,7 +90,7 @@ else
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
-    no_check := ! :
+    RUN_TEST := false
     GOOS := freebsd
 else ifeq ($(DEB_HOST_ARCH_OS), linux)
     GOOS := linux
@@ -113,7 +120,7 @@ else ifeq ($(DEB_HOST_ARCH_CPU), arm)
     GOARCH := arm
     GOPREFIX := 5
 ifeq ($(DEB_HOST_ARCH), armel)
-    nocheck := ! :
+    RUN_TEST := false
     GOARM := 5
 else ifeq ($(DEB_HOST_ARCH), armhf)
     GOARM := 6

-- 
Packaging for Google Go