Revert previous patch (no parallel); the issue was actually running tests on architec...

diff --git a/debian/changelog b/debian/changelog
index 305bf3cd3da75038ea0b3cbd0c5082f4e9a35909..649a4392cf549dbfc304263985857cc32be25de4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lilypond (2.18.2-3) unstable; urgency=medium
+
+  * Revert previous patch (no parallel); the issue was actually running
+    tests on architecture independent builds which had not built any of
+    the documentation. (Closes: #760794)
+
+ -- Don Armstrong <don@debian.org>  Tue, 16 Sep 2014 14:50:14 -0700
+
 lilypond (2.18.2-2) unstable; urgency=high
 
   * Disable parallel support on !amd64 to avoid build failures on those

diff --git a/debian/rules b/debian/rules
index 65219ebcc6dd852407073ff1fcf53d02eeb455e8..7e59b1e63a1441dd9c9716a6e9580bd88dafb510 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -29,17 +29,12 @@ endif
 endif
 
 DOC_OPTIONS := WEB_TARGETS="offline"
-ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), amd64)) 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
        DOC_OPTIONS := $(DOC_OPTIONS) CPU_COUNT=$(firstword $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))))
-PARALLEL_OPTION := "--parallel"
-endif
-else
-PARALLEL_OPTION :=
 endif
 
 %:
-       dh $@ $(PARALLEL_OPTION) --with autotools-dev --with python2 --with quilt
+       dh $@ --parallel --with autotools-dev --with python2 --with quilt
 
 ## we need to nuke the parser files, because if there is a mistmatch
 ## between upstreams bison and our bison, the build will fail epically
@@ -113,6 +108,12 @@ override_dh_installdocs:
                install -m0644 $$a debian/$$package/usr/share/doc-base/$$package; \
        done;
 
+override_dh_auto_test:
+ifneq (,$(filter $(DEB_BUILD_OPTIONS),nocheck))
+       $(MAKE) test-baseline
+    $(MAKE) test
+endif
+
 ## this rule will update debian/control and the per-language install
 ## files; all of the files it generates/modifies should be included in
 ## the Debian package and should not need to be regenerated or