[lintian] 07/10: d/rules: Add a CLEAN_TEST_WORK_DIR for preserving d/test-out
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 91f10f5f017dc3ef37219e3994152cb81b1b22bb
Author: Niels Thykier <niels@thykier.net>
Date: Thu May 14 07:37:00 2015 +0200
d/rules: Add a CLEAN_TEST_WORK_DIR for preserving d/test-out
The change to call dh_clean with -X $(TEST_WORK_DIR) is to avoid it
partially cleaning the test directory when CLEAN_TEST_WORK_DIR is set
to 0.
The entire ordeal can be used like this:
CLEAN_TEST_WORK_DIR=0 dpkg-buildpackage ...
Which will preserve debian/test-out between two runs of
dpkg-buildpackage (making the test runs vastly faster). Note that the
necesary excludes to avoid the test artifacts ending up in the source
package have already been made (see commit 2103dffb) .
Signed-off-by: Niels Thykier <niels@thykier.net>
---
debian/changelog | 5 +++++
debian/rules | 5 ++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index afb62ca..c3d15c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -153,6 +153,11 @@ lintian (2.5.31) UNRELEASED; urgency=medium
+ [AB] Promote xz-utils from Suggests to Depends. (Closes: #774729)
* debian/copyright:
+ [AB] Update copyright years.
+ * debian/rules:
+ + [NT] Add CLEAN_TEST_WORK_DIR to be able to control
+ whether the test artifact directory should be cleaned
+ during a call to "debian/rules clean" (defaulting to
+ do the clean).
* doc/CREDITS:
+ [AB] Add contributors from 2014 and 2015.
diff --git a/debian/rules b/debian/rules
index 594b5c6..66ab9a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,7 @@ tag =
# Work/output dir for tests
# private/runtests gets TEST_WORK_DIR from environment
export TEST_WORK_DIR ?= $(CURDIR)/debian/test-out
+CLEAN_TEST_WORK_DIR ?= 1
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
testtarget = runtests
@@ -100,10 +101,12 @@ clean: $(neededfiles)
rm -f runtests build-stamp
rm -rf doc/lintian.html/ doc/lintian.txt
rm -rf doc/api.html
+ifneq ($(CLEAN_TEST_WORK_DIR),0)
rm -rf "$(TEST_WORK_DIR)"
+endif
rm -rf man/man1/
rm -fr l10n/
- dh_clean
+ dh_clean -X "$(TEST_WORK_DIR)"
binary-indep: $(neededfiles) build
@echo .... binary-indep ....
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: