[pkg-perl-tools] 01/02: Expand smoke-tests's wildcards inside $TDIR and after smoke-setup has been run
Axel Beckert
abe at deuxchevaux.org
Thu Apr 21 20:49:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch master
in repository pkg-perl-tools.
commit c71796b39fdbbea760bde307377f638e54debae2
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Thu Apr 21 22:41:04 2016 +0200
Expand smoke-tests's wildcards inside $TDIR and after smoke-setup has been run
---
autopkgtest/scripts/build-deps.d/smoke | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/autopkgtest/scripts/build-deps.d/smoke b/autopkgtest/scripts/build-deps.d/smoke
index dec96dc..3edb17d 100755
--- a/autopkgtest/scripts/build-deps.d/smoke
+++ b/autopkgtest/scripts/build-deps.d/smoke
@@ -110,10 +110,6 @@ if [ ! -e $TDIR/MANIFEST.SKIP ]; then
cp /dev/null $TDIR/MANIFEST.SKIP
fi
-if [ -r debian/tests/pkg-perl/smoke-tests ]; then
- test_targets=$(eval ls -d $(cat debian/tests/pkg-perl/smoke-tests) 2>/dev/null || true)
-fi
-
# this is intended to be a last resort, please use it responsibly
setup_file=debian/tests/pkg-perl/smoke-setup
if [ -x $setup_file ]
@@ -121,7 +117,11 @@ then
( export TDIR; $setup_file )
fi
+tests_file=$(pwd)/debian/tests/pkg-perl/smoke-tests
cd $TDIR
+if [ -r $tests_file ]; then
+ test_targets=$(eval ls -d $(cat $tests_file) 2>/dev/null || true)
+fi
if command -v xvfb-run >/dev/null
then
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/pkg-perl-tools.git
More information about the Pkg-perl-cvs-commits
mailing list