[pkg-perl-tools] 01/01: autopkgtest/smoke: run prove with --recurse

[ntyni at debian.org]

This is an automated email from the git hooks/post-receive script.

ntyni pushed a commit to branch master
in repository pkg-perl-tools.

commit a3726a3428324cf95c6c389aca70a0bb475b4f8c
Author: Niko Tyni <ntyni at debian.org>
Date:   Sat May 20 18:22:49 2017 +0300

    autopkgtest/smoke: run prove with --recurse
    
    This takes away most needs for the smoke-tests configuration file,
    and seems to work for at least libimager-perl and libdancer2-perl.
    
    Thanks to Alex Muntada for the idea.
---
 TODO                                   |  1 -
 autopkgtest/README.autopkgtest         | 10 ++++------
 autopkgtest/scripts/build-deps.d/smoke |  4 ++--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/TODO b/TODO
index fb48430..4c73add 100644
--- a/TODO
+++ b/TODO
@@ -25,6 +25,5 @@ TODOS:
   #   at /usr/share/perl5/Test/Perl/Critic.pm line 104.
   #
   #   Code before strictures are enabled at line 2, column 1.  See page 429 of PBP.  (Severity: 5)
-- autopkgtest: maybe also run tests from sub-directories (t/*.t t/*/*.t)?
 - autopkgtest: maybe skip more *pod* tests?
 - autopkgtest: option run syntax.t even if there are Suggests?
diff --git a/autopkgtest/README.autopkgtest b/autopkgtest/README.autopkgtest
index ea73dd4..d7e4203 100644
--- a/autopkgtest/README.autopkgtest
+++ b/autopkgtest/README.autopkgtest
@@ -60,12 +60,10 @@ The environment variables AUTOMATED_TESTING=1 and NONINTERACTIVE_TESTING=1
 are set by default for the smoke test. You can override these and add
 others in 'debian/tests/pkg-perl/smoke-env'.
 
-In case your module doesn't have all its ".t" files directly under
-"t/" (i.e. if prove should run something else than "t/*.t", you can
-use 'debian/tests/pkg-perl/smoke-tests' to declare which files should
-be used instead of "t/*.t". Example from libdevel-cover-perl:
-
-  t/*/*.t
+You can use 'debian/tests/pkg-perl/smoke-tests' to declare which files should
+be used instead of all *.t files under t/. (Prior to version 0.37 only
+the tests in the first directory level under t/ were used, but nowadays
+prove is invoked with the --recurse option.)
 
 If the file 'debian/tests/pkg-perl/smoke-setup' exists and is executable,
 it will be executed right before running the tests, with the working
diff --git a/autopkgtest/scripts/build-deps.d/smoke b/autopkgtest/scripts/build-deps.d/smoke
index 822d91b..7ff120f 100755
--- a/autopkgtest/scripts/build-deps.d/smoke
+++ b/autopkgtest/scripts/build-deps.d/smoke
@@ -36,7 +36,7 @@ export AUTOMATED_TESTING=1
 export NONINTERACTIVE_TESTING=1
 
 # overridable with smoke-env
-PKG_PERL_PROVE_ARGS="--merge"
+PKG_PERL_PROVE_ARGS="--recurse --merge"
 
 env_list=debian/tests/pkg-perl/smoke-env
 if [ ! -r $env_list ]; then
@@ -138,7 +138,7 @@ else
     XVFB=
 fi
 
-if [ -z "$test_targets" ] && [ -d t ]; then test_targets=$(ls -d t/*.t 2>/dev/null || true); fi
+if [ -z "$test_targets" ] && [ -d t ]; then test_targets=t; fi
 
 if [ ! -n "$test_targets" ]; then
     echo 'Nothing to prove, skipping.'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/pkg-perl-tools.git