From: Anthony Fok <foka@debian.org>
Date: Sun, 29 Jan 2017 11:15:12 +0000 (-0700)
Subject: Run tests only when documentation has been built
X-Git-Tag: debian/2.18.2-9~12
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=dc426c6a50b792d93798d03d112062ebb3f06ec2;p=lilypond.git

Run tests only when documentation has been built

This was accomplished by splitting override_dh_auto_test into two,
i.e., an empty override_dh_auto_test-arch (hence disabled), and
an override_dh_auto_test-indep where the tests are actually run.

Also fix the check for DEB_BUILD_OPTIONS=nocheck.
Previously, the tests were run only when "nocheck" was defined.
See #760794 for previous discussions.
---

diff --git a/debian/rules b/debian/rules
index 48ceeb3221..cb8223a4c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -182,8 +182,12 @@ override_dh_shlibdeps-arch:
 	$(eval unexport LD_LIBRARY_PATH)
 	dh_shlibdeps -a -O--parallel -lusr/lib/$(DEB_HOST_MULTIARCH)/lilypond/$(LILYPOND_VERSION)/guile
 
-override_dh_auto_test:
-ifneq (,$(filter $(DEB_BUILD_OPTIONS),nocheck))
+# Skip tests for architecture-dependent-only build because
+# the test would fail without built documentation.
+override_dh_auto_test-arch:
+
+override_dh_auto_test-indep:
+ifeq (,$(filter $(DEB_BUILD_OPTIONS),nocheck))
 	$(MAKE) test-baseline
 	$(MAKE) test
 endif