[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.94.dfsg.2-1-315-g4bfd15d

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit 4bfd15df0fbfe41df0ffbfebc9b9987fdc3920aa
Author: Michael Tautschnig <mt at debian.org>
Date:   Fri Mar 13 12:48:58 2009 +0100

    Added check target
    
    - Run make check unless disabled via nocheck
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 428ac94..84c3c87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ clamav (0.95rc1+dfsg-1) unstable; urgency=low
     get support for runtime loading (nonfree) unrar code if the user so
     decides.
   * Fixed watch file to deal with new versioning schema (+dfsg).
+  * Run make check unless nocheck is in DEB_BUILD_OPTIONS.
 
  -- Michael Tautschnig <mt at debian.org>  Fri, 13 Mar 2009 12:40:50 +0100
 
diff --git a/debian/rules b/debian/rules
index 9285e74..05cd3c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,15 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 else
 	DEBUG_OPTS += --enable-debug
 endif
+ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+  with_check := disabled by DEB_BUILD_OPTIONS.
+else
+  ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+    with_check := disabled because cross-compiling.
+  else
+    with_check := yes
+  endif
+endif
 
 config.status: configure
 	dh_testdir
@@ -91,6 +100,14 @@ endif
 	rm -f debian/clamav-freshclam.postinst
 	dh_clean
 
+check:
+	dh_testdir
+ifeq ($(with_check),yes)
+	$(MAKE) check
+else
+	@echo "Testsuite not run: $(with_check)."
+endif
+
 install: install-indep install-arch
 install-indep: install-indep-stamp
 install-indep-stamp: build-indep-stamp
@@ -147,7 +164,7 @@ clamav-testfiles: install-indep
 	dh_fixperms -p$@
 	dh_builddeb -p$@
 
-install-arch: install-arch-stamp
+install-arch: install-arch-stamp check
 install-arch-stamp: build-stamp
 	dh_testdir
 	dh_testroot
@@ -304,4 +321,4 @@ binary-indep: build install clamav-base clamav-testfiles clamav-docs
 binary-arch: build install libclamav6 clamav clamav-daemon clamav-freshclam clamav-milter libclamav-dev clamav-dbg
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install check

-- 
Debian repository for ClamAV