[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4+dfsg-2-13-gf6060ea

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 9447956b2fa10dbc5781240a861b20a408d967ac
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Jun 13 15:07:48 2009 +0200

      * debian/rules:
        + Added test target and run basic runtime tests if nocheck wasn't passed via
          DEB_BUILD_OPTIONS as part of the build.

diff --git a/debian/changelog b/debian/changelog
index e2c80fa..f4dc6bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,9 @@ mono (2.4+dfsg-3) unstable; urgency=low
   * debian/patches/fix_sparc_support_r134797.patch:
     + Fixes the hang for all applications when running on SPARC.
       (Closes: #531566)
+  * debian/rules:
+    + Added test target and run basic runtime tests if nocheck wasn't passed via
+      DEB_BUILD_OPTIONS as part of the build.
 
  -- Mirco Bauer <meebey at debian.org>  Mon, 25 May 2009 20:46:12 +0200
 
diff --git a/debian/rules b/debian/rules
index 38a980c..688bdb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,6 +60,12 @@ else
 	CFLAGS += -O2 -g
 endif
 
+ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	TEST = true
+else
+	TEST = cd mono/tests && make test
+endif
+
 CONFIGURE =	CFLAGS="$(CFLAGS)" \
 		./configure $(CONF_FLAGS) --prefix=/usr \
 		  --mandir=\$${prefix}/share/man \
@@ -122,6 +128,12 @@ build-indep-stamp:
 	         debian/dh_monoaot
 	touch $@
 
+test: test-arch
+test-arch: test-arch-stamp
+test-arch-stamp: build-arch-stamp
+	-$(TEST)
+	touch $@
+
 clean: clean-patched unpatch
 clean-patched:
 	echo "distro is $(DISTRO)"
@@ -356,7 +368,7 @@ binary-indep: build-arch install-arch build-indep install-indep
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: build-arch install-arch
+binary-arch: build-arch install-arch test-arch-stamp
 	dh_testdir
 	dh_testroot
 	
@@ -424,5 +436,5 @@ get-orig-source:
 	tar -czf $(DEB_SOURCE_NAME)_$(UPVERSION)+dfsg.orig.tar.gz $(TARBALL_DIR)+dfsg
 	rm -r $(TARBALL_DIR)+dfsg
 
-.PHONY: autoreconf configure-arch configure-indep clean clean-patched build build-all build-arch build-indep binary-indep binary-arch install install-all install-arch install-indep binary binary-arch binary-indep patch unpatch get-orig-source
+.PHONY: autoreconf configure-arch configure-indep clean clean-patched build build-all build-arch build-indep test test-arch binary-indep binary-arch install install-all install-arch install-indep binary binary-arch binary-indep patch unpatch get-orig-source
 .NOTPARALLEL:

-- 
mono