Ema has submitted this change and it was merged. Change subject: Skip tests if varnishtest is not installed ......................................................................
Skip tests if varnishtest is not installed varnishtest is provided by the 'varnish' package, and we do not want to build-depend on it just to run VMOD tests. Do not run make check in dh_auto_test if varnishtest is not found on the build host. Additionally, specify 'export-dir' in gbp.conf. Bug: T124281 Change-Id: I0946624bf5c916ac636f46a298be959a9eb579a9 --- M debian/gbp.conf M debian/rules 2 files changed, 8 insertions(+), 0 deletions(-) Approvals: Ema: Verified; Looks good to me, approved diff --git a/debian/gbp.conf b/debian/gbp.conf index fe2e931..7e35015 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,3 +1,4 @@ [git-buildpackage] upstream-tree=4.1 debian-branch=debian +export-dir = ../build-area diff --git a/debian/rules b/debian/rules index 64ab0f6..66e87b8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,12 @@ #!/usr/bin/make -f +# varnishtest is provided by the 'varnish' package, and we do not want to +# build-depend on it just to run VMOD tests. Do not run make check in +# dh_auto_test if varnishtest is not found on the build host. +ifeq (, $(shell which varnishtest)) + export DEB_BUILD_OPTIONS = nocheck +endif + %: dh $@ --with autoreconf -- To view, visit https://gerrit.wikimedia.org/r/268385 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0946624bf5c916ac636f46a298be959a9eb579a9 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/varnish/libvmod-header Gerrit-Branch: debian Gerrit-Owner: Ema <e...@wikimedia.org> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Ema <e...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits