[SCM] Debian package checker branch, master, updated. 2.5.1-189-gb8ea6ff
The following commit has been merged in the master branch:
commit b8ea6ff9f21a55a33ae49aaa9efa29d17d794180
Author: Niels Thykier <niels@thykier.net>
Date: Sat Aug 6 17:47:39 2011 +0200
private/runtests: Use debian/test-out rather than debian/tests
debian/tests is used by autopkgtest (see DEP-8 spec)
diff --git a/.gitignore b/.gitignore
index 126c8f2..36bdae9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
/build-stamp
-/debian/tests
+/debian/test-out/
/doc/README
/doc/help.tmp
/doc/lintian.html/
diff --git a/debian/rules b/debian/rules
index 626bf81..69a1fc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,10 @@ perlprovides := data/fields/perl-provides
onlyrun =
tag =
+# Work/output dir for tests
+# private/runtests gets TEST_WORK_DIR from environment
+export TEST_WORK_DIR:= $(CURDIR)/debian/test-out
+
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
testtarget = runtests
else
@@ -34,8 +38,8 @@ $(profiles): $(allchecks) private/generate-profiles.pl
runtests: $(neededfiles) $(allchecks) $(allcollect) $(tagfiles) $(testfiles)
@echo .... running tests ....
- rm -rf debian/tests
- mkdir debian/tests
+ rm -rf "$(TEST_WORK_DIR)"
+ mkdir "$(TEST_WORK_DIR)"
private/runtests $(PAR_ARGS) $(onlyrun)
if [ "$(onlyrun)" = "" ]; then touch $@; fi
@@ -45,8 +49,8 @@ check-tag:
@if [ "$(tag)" = "" ]; then \
echo 'Specify tag to test with tag=<tag>'; exit 1; \
fi
- rm -rf debian/tests
- mkdir debian/tests
+ rm -rf "$(TEST_WORK_DIR)"
+ mkdir "$(TEST_WORK_DIR)"
private/runtests $(PAR_ARGS) -t $(tag)
# this target is only run manually
@@ -79,7 +83,7 @@ clean: $(neededfiles)
rm -f runtests build-stamp
rm -f doc/help.tmp doc/README
rm -rf doc/lintian.html/ doc/lintian.txt
- rm -rf debian/tests
+ rm -rf "$(TEST_WORK_DIR)"
rm -rf man/man1/
rm -fr debian/test.locale
dh_clean
diff --git a/private/runtests b/private/runtests
index f6fe04b..320102b 100755
--- a/private/runtests
+++ b/private/runtests
@@ -23,6 +23,8 @@ LINTIAN_INTERNAL_TESTSUITE=1
LOCPATH="$(pwd)/debian/test.locale"
NO_PKG_MANGLE=true
+[ "$TEST_WORK_DIR" ] || TEST_WORK_DIR="debian/test-out"
+
export LANG
export LC_COLLCATE
export LINTIAN_ROOT
@@ -43,7 +45,7 @@ if [ ! -e "$LOCPATH"/en_US.UTF-8 ] ; then
--quiet "$LOCPATH"/en_US.UTF-8 || fail "Locale generation failed"
fi
-t/runtests --dump-logs -k $PARALLEL_ARGS t debian/tests "$@"
+t/runtests --dump-logs -k $PARALLEL_ARGS t "$TEST_WORK_DIR" "$@"
if [ "$TAG" = "" ] ; then
- testset/runtests -k testset debian/tests "$@"
+ testset/runtests -k testset "$TEST_WORK_DIR" "$@"
fi
--
Debian package checker
Reply to: