[Pkg-ocaml-maint-commits] [SCM] ocaml-zarith packaging branch, master, updated. debian/1.0-5-1-ga908624

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit a90862456aa73cba1e39b85af86e74aea0e3c5b4
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri Feb 10 18:02:03 2012 +0100

    Don't run test-suite if DEB_BUILD_OPTS contains "nocheck".

diff --git a/debian/changelog b/debian/changelog
index dfcdc05..db1ac6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-zarith (1.0-6) UNRELEASED; urgency=low
+
+  * Don't run test-suite if DEB_BUILD_OPTS contains "nocheck".
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Fri, 10 Feb 2012 18:00:05 +0100
+
 ocaml-zarith (1.0-5) unstable; urgency=low
 
   * Fix FTBFS on sparc
diff --git a/debian/rules b/debian/rules
index 56c6125..256393a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,11 +12,13 @@ endif
 	$(MAKE) install
 
 override_dh_auto_test:
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 	./test
 else
 	CAML_LD_LIBRARY_PATH=$(CURDIR) ./test.b
 endif
+endif
 
 override_dh_auto_configure:
 	./configure --installdir $(Z_INSTALL_DIR) \

-- 
ocaml-zarith packaging