[arrayfire] 04/05: d/rules: minor fixes: - Add missing export command to DH_VERBOSE. - Use documented formatting for dpkg-architecture queries. - Use cleaner layout for comments regarding dh_auto_test.

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository arrayfire.

commit a2568c3a92080c7332f7e15f9d030ed548269890
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Aug 2 10:28:46 2016 +0100

    d/rules: minor fixes:
    - Add missing export command to DH_VERBOSE.
    - Use documented formatting for dpkg-architecture queries.
    - Use cleaner layout for comments regarding dh_auto_test.
---
 debian/rules | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index 34bf3e7..a05f0cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-#DH_VERBOSE = 1
+#export DH_VERBOSE = 1
 
 # Hardening flags.
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
@@ -10,9 +10,8 @@ export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
 export DEB_CXXFLAGS_MAINT_APPEND = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-# Environment information.
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH_CPU := $(shell dpkg-architecture --query DEB_HOST_ARCH_CPU)
+DEB_HOST_MULTIARCH := $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
 
 # Build without AltiVec support on ppc64el.
 ifeq ($(DEB_HOST_ARCH_CPU),ppc64el)
@@ -55,15 +54,17 @@ override_dh_auto_configure-arch:
 override_dh_auto_configure-indep:
 	dh_auto_configure -- $(BUILD_OPTIONS) -DBUILD_DOCS=ON
 
+# NOTE: Testcases labelled dense or large are currently disabled to lower the
+# workload on the builders. Remove the exclusion regexes to enable them.
+# NOTE: The testsuite for the unified backend is performed for the CPU backend
+# only.
 # NOTE: The imageio testcase fails on some architectures. It has been
 # temporarily disabled whilst upstream is working on a fix.
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	dh_auto_test -- ARGS+="-R cpu -E large -E dense -E imageio"
-	# NOTE: The testsuite for the unified backend is run on the CPU backend only.
-	# Change the name regex to libaf*.so* to run on all backends.
 	LD_LIBRARY_PATH=$(shell find $(CURDIR) -type f -name "libafcpu.so*" -exec dirname {} \;) \
-	dh_auto_test -- ARGS+="-R unified"
+		dh_auto_test -- ARGS+="-R unified"
 endif
 
 override_dh_install-indep:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git