[Pkg-scicomp-commits] [SCM] qhull branch, master, updated. b3025cf16e006bd39965565fe569ce9dcecbbd0d

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit d8652f16b7f8699c5a1cf295053272b68de6692b
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sun Jun 14 20:53:42 2009 +0200

    Use DEB_MAKE_CHECK_TARGET to run the unit tests

diff --git a/debian/changelog b/debian/changelog
index caf5989..29dcc22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,11 @@ qhull (2009.1-1) UNRELEASED; urgency=low
   * debian/patches/manpage-macros.patch: Drop patch (applied upstream)
   * debian/source.lintian-overrides: Drop obsolete override for Lintian
     warning ancient-libtool
-  * debian/rules: Avoid running twice the build/qhull-bin rule (via a
-    build-stamp file)
+  * debian/rules:
+    + Use DEB_MAKE_CHECK_TARGET to run the unit tests through the check
+      rule in debian/rules
+    + Avoid running twice the build/qhull-bin rule (via a build-stamp
+      file)
   * debian/clean: Remove build-stamp
   * debian/watch: Fix URL and regex for upstream tarball
 
diff --git a/debian/rules b/debian/rules
index a90977c..d448816 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ htmldir	:= $(debdir)/tmp/usr/share/doc/qhull/html
 DEB_DH_INSTALL_SOURCEDIR = debian/tmp
 DEB_COMPRESS_EXCLUDE = .c .h .txt
 CFLAGS := $(CFLAGS) -fno-strict-aliasing
+DEB_MAKE_CHECK_TARGET = -C debian -f rules check
 
 build/qhull-bin:: build-stamp
 build-stamp:
@@ -29,10 +30,12 @@ build-stamp:
 	      docbook2x-man $$comm.xml ;				\
 	      echo " done" ;						\
 	  done )
-	# Run tests
-	PATH=./src/:$$PATH /bin/sh eg/q_test
 	touch build-stamp
 
+check:
+	# Run tests
+	cd .. ; PATH=./src/:$$PATH /bin/sh eg/q_test
+
 install/libqhull-doc::
 	# Install all the needed documentation files
 	cp *.txt html/*.txt $(htmldir)

-- 
qhull