[asl] 01/02: d/{control,rules}: disable tests

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Fri Aug 28 08:35:02 UTC 2015


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

ghisvail-guest pushed a commit to branch debian/sid
in repository asl.

commit f2390e14ad23338652fb92cdd794bc372ba52a98
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Aug 28 08:10:03 2015 +0100

    d/{control,rules}: disable tests
    
    Rationales: upstream test suite does not work properly with pocl-opencl-icd.
    
    It works with nvidia-opencl-icd, which indicates a weakness in pocl
    implementation rather than a bug in the test suite. Upstream stated their
    comitment to get most of the test suite to run on pocl in the next few
    releases.
---
 debian/control |  6 ++----
 debian/rules   | 15 +--------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index 3830b13..89f3ad9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: science
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Build-Depends: clinfo,
-               cmake,
+Build-Depends: cmake,
                debhelper (>=9),
                doxygen,
                libboost-filesystem-dev (>= 1.55),
@@ -12,8 +11,7 @@ Build-Depends: clinfo,
                libboost-system-dev (>= 1.55),
                libmatio-dev,
                libvtk6-dev (>= 6.1),
-               ocl-icd-opencl-dev | opencl-dev,
-               pocl-opencl-icd | opencl-icd
+               ocl-icd-opencl-dev | opencl-dev
 Standards-Version: 3.9.6
 Homepage: http://asl.org.il
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/asl.git
diff --git a/debian/rules b/debian/rules
index 66c0b3d..fbf5468 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,10 +7,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-# Detect OpenCL compute capability
-num_opencl_platforms := $(shell clinfo | head -n1 | \
-	sed -e "s/.*[^0-9]\([0-9]\+\)[^0-9]*$$/\1/")
-
 %:
 	dh $@ --parallel 
 
@@ -21,19 +17,10 @@ override_dh_auto_configure:
 		-DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_TARGET_MULTIARCH)" \
 		-DWITH_API_DOC=ON \
 		-DWITH_EXAMPLES=OFF \
-		-DWITH_MATIO=ON \
-		-DWITH_TESTS=ON
+		-DWITH_MATIO=ON
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS.md
 
 override_dh_strip:
 	dh_strip --dbg-package=libasl0-dbg
-
-ifeq ($(num_opencl_platforms), 0)
-override_dh_auto_test:
-	@echo "I: No OpenCL platform available, skipping test"   
-else
-override_dh_auto_test:
-	dh_auto_test
-endif

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



More information about the debian-science-commits mailing list