Run the test suite

diff --git a/debian/control.in b/debian/control.in
index ac2b4fa98615b47a30f3ab533ee65e37371dff41..236ce19388b4b193e548f82d8221d6c1d208a378 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -11,6 +11,7 @@ Uploaders:
 Build-Depends:
  debhelper (>= 8),
  pkg-config,
+ quilt,
  autotools-dev,
  binutils-dev,
  tcl8.5-dev,

diff --git a/debian/rules b/debian/rules
index 539656208e30db86f27d50275ea0cba2037b612d..32ebd341598c72d74b925e3d0128e679a05bc227 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -30,12 +30,17 @@ include debian/ocamlinit.mk
 MD5SUMSDIR = /var/lib/ocaml/md5sums
 INSTDIR = $(CURDIR)/debian/tmp/usr
 DISTDIR = $(PACKAGE)-$(OCAML_ABI)
+UPSTREAM_VERSION = $(shell dpkg-parsechangelog | awk '/^Version:/{print $$2}' | { read u; echo $${u%-*}; })
+UPSTREAM_TARBALL = ../$(PACKAGE)_$(UPSTREAM_VERSION).orig.tar.gz
 SRCTARBALL = $(PACKAGE)-source-$(OCAML_ABI).tar.bz2
 
+TESTDIR := debian/test-build
+TESTRULES := debian/rules DEB_TEST_BUILD_PREFIX=$(CURDIR)/$(TESTDIR)
+
+ifeq (,$(DEB_TEST_BUILD_PREFIX))
 ifneq (,$(findstring ocaml-source,$(ALL_PACKAGES)))
   TARBALL_TARGET = debian/$(SRCTARBALL)
-else
-  TARBALL_TARGET =
+endif
 endif
 
 # Environment variable for dh_ocaml
@@ -54,10 +59,10 @@ export OCAML_OPT_ARCH
 export OCAML_STDLIB_DIR
 
 CONFIGURE_OPTS := \
-  --with-pthread -prefix /usr \
-  -libdir $(OCAML_STDLIB_DIR) \
+  --with-pthread -prefix $(DEB_TEST_BUILD_PREFIX)/usr \
+  -libdir $(DEB_TEST_BUILD_PREFIX)$(OCAML_STDLIB_DIR) \
   -x11lib "$(shell pkg-config --variable=libdir x11)" \
-  -mandir /usr/share/man \
+  -mandir $(DEB_TEST_BUILD_PREFIX)/usr/share/man \
   -tkdefs "-I/usr/include/tcl8.5" \
   -tklibs "-L/usr/lib -ltk8.5 -ltcl8.5"
 
@@ -70,6 +75,11 @@ CONFIGURE_SED := \
 %:
        dh $@
 
+# Needed because there is a "build" in the upstream tarball
+.PHONY: build
+build:
+       dh $@
+
 ocamlinit-stamp: $(TARBALL_TARGET)
 
 # Generate ocaml-native-compilers' Architecture field.
@@ -175,7 +185,7 @@ endif
                sed -i 1d emacs/ocamltags.in; \
        fi
 # Remaining stuff
-       -rm -Rf debian/$(SRCTARBALL) debian/examples
+       -rm -Rf debian/$(SRCTARBALL) debian/examples $(TESTDIR)
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install: install-stamp
@@ -194,6 +204,7 @@ endif
 # Install OCaml
        sed -e 's|PREFIX=\"/.*\"|PREFIX=\"$(INSTDIR)"|' < config/config.sh > config/config.debian.install.sh
        $(MAKE) install PREFIX=$(INSTDIR)
+ifeq (,$(DEB_TEST_BUILD_PREFIX))
 # Remove empty directory
        rmdir $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)/ocamldoc/custom
 # To avoid erroneous dh_install warnings
@@ -225,6 +236,7 @@ endif
          ln -sf ../ocaml-base-nox/README.gz . && \
          ln -sf ../ocaml-base-nox/README.Debian .; \
        ); done
+endif
 # Remaining stuff
        touch $@
 
@@ -260,3 +272,27 @@ regenerate: debian/control
        git ls-tree --name-only -r HEAD debian \
          | grep -v '^debian/\(patches/\|source/local-\)' \
        > debian/MANIFEST
+
+.PHONY: override_dh_auto_test
+override_dh_auto_test:
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+# The test suite needs the just-compiled ocaml to be installed, so we
+# rebuild a version with a local prefix and install it to run the
+# tests; see:
+#   http://caml.inria.fr/mantis/view.php?id=5483
+ifeq (,$(DEB_TEST_BUILD_PREFIX))
+       rm -rf $(TESTDIR)
+       mkdir $(TESTDIR)
+       tar -C $(TESTDIR) -xf $(UPSTREAM_TARBALL)
+       tar -c --files-from=debian/MANIFEST | tar -C $(TESTDIR)/ocaml-* -x
+       cp -a debian/patches $(TESTDIR)/ocaml-*/debian
+       cd $(TESTDIR)/ocaml-* \
+         && QUILT_PATCHES=debian/patches quilt push -a \
+         && $(TESTRULES) build \
+         && dh_installdirs \
+         && $(TESTRULES) install-stamp \
+         && cp -a debian/tmp/* .. \
+         && cd testsuite \
+         && make all
+endif
+endif