[Pkg-haskell-commits] darcs: haskell-devscripts: Run Cabal-defined testsuites, if DEB_ENABLE_TESTS = yes is set in debian/rules.

[Joachim Breitner]

Wed Jan  4 19:13:08 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Run Cabal-defined testsuites, if DEB_ENABLE_TESTS = yes is set in debian/rules.
  Ignore-this: 9b026682a711dbedbca7e5c9d8144779

    M ./debian/changelog +7
    M ./hlibrary.mk -3 +27

Wed Jan  4 19:13:08 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Run Cabal-defined testsuites, if DEB_ENABLE_TESTS = yes is set in debian/rules.
  Ignore-this: 9b026682a711dbedbca7e5c9d8144779
diff -rN -u old-haskell-devscripts//debian/changelog new-haskell-devscripts//debian/changelog
--- old-haskell-devscripts//debian/changelog	2012-01-04 19:13:52.475670874 +0000
+++ new-haskell-devscripts//debian/changelog	2012-01-04 19:13:52.531672340 +0000
@@ -1,3 +1,10 @@
+haskell-devscripts (0.8.10) UNRELEASED; urgency=low
+
+  * Run Cabal-defined testsuites, if DEB_ENABLE_TESTS = yes is set in
+    debian/rules.
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 04 Jan 2012 19:53:51 +0100
+
 haskell-devscripts (0.8.9) unstable; urgency=low
 
   [ Giovanni Mascellani ]
diff -rN -u old-haskell-devscripts//hlibrary.mk new-haskell-devscripts//hlibrary.mk
--- old-haskell-devscripts//hlibrary.mk	2012-01-04 19:13:52.467670774 +0000
+++ new-haskell-devscripts//hlibrary.mk	2012-01-04 19:13:52.531672340 +0000
@@ -30,6 +30,8 @@
 CABAL_PACKAGE=$(DEB_CABAL_PACKAGE)
 CABAL_VERSION=$(shell cat *.cabal | egrep -i '^\s*version:' | head -n1 | sed -r 's,^\s*version:\s*,,i'| sed -r 's,\s*$$,,i')
 
+DEB_ENABLE_TESTS ?= no
+
 ENABLE_PROFILING = $(shell egrep -qe '^Package: libghc-.*-prof$$' debian/control && echo --enable-library-profiling; exit 0)
 
 NO_GHCI_FLAG = $(shell test -e /usr/bin/ghci || echo --ghc-option=-DDEBIAN_NO_GHCI; exit 0)
@@ -66,6 +68,12 @@
    OPTIMIZATION = --disable-optimization
 endif
 
+ifeq ($(DEB_ENABLE_TESTS),yes)
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+   TESTS = --enable-tests
+endif
+endif
+
 DEB_BUILD_DEPENDENCIES = build-arch
 
 clean::
@@ -87,13 +95,29 @@
 		--builddir=dist-ghc \
 		--haddockdir=$(DEB_HADDOCK_DIR) \
 		--htmldir=$(DEB_HADDOCK_HTML_DIR) $(ENABLE_PROFILING) $(NO_GHCI_FLAG) \
-		$(DEB_SETUP_GHC6_CONFIGURE_ARGS) $(DEB_SETUP_GHC_CONFIGURE_ARGS) $(OPTIMIZATION)
+		$(DEB_SETUP_GHC6_CONFIGURE_ARGS) $(DEB_SETUP_GHC_CONFIGURE_ARGS) $(OPTIMIZATION) $(TESTS)
 
 build-ghc-stamp: dist-ghc
 	$(DEB_SETUP_BIN_NAME) build --builddir=dist-ghc
-	touch build-ghc-stamp
+	touch $@
+
+ifeq ($(DEB_ENABLE_TESTS),yes)
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+check-ghc-stamp: build-ghc-stamp
+	$(DEB_SETUP_BIN_NAME) test --builddir=dist-ghc
+	touch $@
+else
+check-ghc-stamp: build-ghc-stamp
+	@echo DEB_BUILD_OPTIONS contains nocheck, not running checks
+	touch $@
+endif
+else
+check-ghc-stamp: build-ghc-stamp
+	@echo DEB_ENABLE_TESTS not set to yes, not running any tests.
+	touch $@
+endif
 
-build/libghc-$(CABAL_PACKAGE)-prof build/libghc-$(CABAL_PACKAGE)-dev:: build-ghc-stamp
+build/libghc-$(CABAL_PACKAGE)-prof build/libghc-$(CABAL_PACKAGE)-dev:: build-ghc-stamp check-ghc-stamp
 
 build-haddock-stamp:
 	[ ! -x /usr/bin/haddock ] || $(DEB_SETUP_BIN_NAME) haddock --builddir=dist-ghc $(DEB_HADDOCK_OPTS)