This is an automated email from the git hooks/post-receive script.
ntyni pushed a commit to branch ntyni/autopkgtest
in repository pkg-perl-tools.
commit 5d358a74aa1a16670abc11f764129cfe591bcbe1
Author: Niko Tyni <nt...@debian.org>
Date: Fri Sep 25 22:42:51 2015 +0300
Make it possible to override the prove --merge option
Setting PKG_PERL_PROVE_ARGS="" in debian/tests/pkg-perl/smoke-env
will override the default usage of the --merge option.
The vast majority of test suites work fine with --merge, so opt-out
should be OK.
As this introduces a possibility of stderr output, we need to explicitly
redirect it to stdout. Lots of test suites use stderr for diag() and
the like.
Closes: #799444
---
autopkgtest/scripts/build-deps.d/smoke | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/autopkgtest/scripts/build-deps.d/smoke
b/autopkgtest/scripts/build-deps.d/smoke
index 45e1c5a..93e31af 100755
--- a/autopkgtest/scripts/build-deps.d/smoke
+++ b/autopkgtest/scripts/build-deps.d/smoke
@@ -17,6 +17,9 @@ fi
export AUTOMATED_TESTING=1
export NONINTERACTIVE_TESTING=1
+# overridable with smoke-env
+PKG_PERL_PROVE_ARGS="--merge"
+
env_list=debian/tests/pkg-perl/smoke-env
if [ ! -r $env_list ]; then
env_list=debian/tests/pkg-perl/env-smoke
@@ -103,7 +106,7 @@ if [ -d t ]; then test_targets=$(ls -d t/*.t 2>/dev/null ||
true); fi
if [ ! -n "$test_targets" ]; then
echo 'Nothing to prove, skipping.'
else
- $XVFB prove --blib --merge --verbose $test_targets
+ $XVFB prove --blib --verbose $PKG_PERL_PROVE_ARGS $test_targets 2>&1
fi
if [ -f test.pl ]; then $XVFB perl ./test.pl; fi
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/pkg-perl-tools.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
