From dc426c6a50b792d93798d03d112062ebb3f06ec2 Mon Sep 17 00:00:00 2001 From: Anthony Fok Date: Sun, 29 Jan 2017 04:15:12 -0700 Subject: [PATCH] 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. --- debian/rules | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 -- 2.39.5