[arrayfire] 03/06: d/rules: improve and simplify dh_auto_test override: - Replace explicit calls to ctest with dh_auto_test. - Enable running the testsuite in parallel. - Drop usage of explicit build directory.

[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 17ca1d57d9b1cb908e1041b0af3b6a7f0bd0eebd
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Apr 12 10:13:57 2016 +0100

    d/rules: improve and simplify dh_auto_test override:
    - Replace explicit calls to ctest with dh_auto_test.
    - Enable running the testsuite in parallel.
    - Drop usage of explicit build directory.
---
 debian/rules | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/debian/rules b/debian/rules
index dde3f39..2aaa9ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,8 +13,6 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 # Environment information.
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-BUILDDIR = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
 
 # Build without AltiVec support on ppc64el.
 ifeq ($(DEB_HOST_ARCH),ppc64el)
@@ -52,11 +50,8 @@ CMAKE_BUILD_OPTIONS += \
 	-DBUILD_TEST=OFF
 endif
 
-# Prevent execution of slow tests.
-CTEST_EXCLUDE_REGEX = large|dense
-
 %:
-	dh $@ --parallel --builddirectory=$(BUILDDIR)
+	dh $@ --parallel
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -71,15 +66,11 @@ override_dh_auto_configure-indep:
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	cd $(BUILDDIR) && \
-	CTEST_OUTPUT_ON_FAILURE=1 \
-	ctest --force-new-ctest-process -R "cpu" -E "$(CTEST_EXCLUDE_REGEX)"
+	dh_auto_test -- ARGS+="-R cpu -E large -E dense"
 	# 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.
-	cd $(BUILDDIR) && \
-	LD_LIBRARY_PATH=$(shell find $(BUILDDIR) -type f -name "libafcpu.so*" -exec dirname {} \;) \
-	CTEST_OUTPUT_ON_FAILURE=1 \
-	ctest --force-new-ctest-process -R "unified" -E "$(CTEST_EXCLUDE_REGEX)"
+	LD_LIBRARY_PATH=$(shell find $(CURDIR) -type f -name "libafcpu.so*" -exec dirname {} \;) \
+	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