[pkg-perl-tools] 01/05: Rename autopkgtest configuration files, with a fallback to the old names
Niko Tyni
ntyni at moszumanska.debian.org
Sat Sep 26 06:21:57 UTC 2015
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 2b720e662e34f2c5ba64c96ca8ac7ecbb4569dc9
Author: Niko Tyni <ntyni at debian.org>
Date: Fri Sep 25 22:36:20 2015 +0300
Rename autopkgtest configuration files, with a fallback to the old names
This brings at least some logic to the naming.
Closes: #799487
---
autopkgtest/README.autopkgtest | 10 +++++-----
autopkgtest/scripts/build-deps.d/smoke | 16 +++++++++++++---
.../scripts/runtime-deps-and-recommends.d/syntax.t | 3 ++-
autopkgtest/scripts/runtime-deps.d/use.t | 5 +++--
4 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/autopkgtest/README.autopkgtest b/autopkgtest/README.autopkgtest
index 9903b2e..a1012f0 100644
--- a/autopkgtest/README.autopkgtest
+++ b/autopkgtest/README.autopkgtest
@@ -28,24 +28,24 @@ The file can contain empty lines and comment lines starting with the '#' sign.
If your test suite needs files other than the contents of directory 't/' for
running prove, then you should list all files or directories to be copied to
-the test running directory in the file 'debian/tests/pkg-perl/test-files'.
+the test running directory in the file 'debian/tests/pkg-perl/smoke-files'.
Empty lines and #-style comment lines are supported.
If there are just a few test files in the main test suite that fail smoke.t,
-you can ignore those by adding them to 'debian/tests/pkg-perl/skip-smoke',
+you can ignore those by adding them to 'debian/tests/pkg-perl/smoke-skip',
one per line. Empty lines and #-style comments are supported. Note that
t/97_meta.t, t/04critic.t, t/boilerplate.t, t/pod.t, and t/pod-coverage.t
are skipped automatically unless you provide a skip list.
If the runtime-deps.d/use.t test fails to get the main module of your
package right, you can customize that by putting the right name in
-'debian/tests/pkg-perl/module-name'.
+'debian/tests/pkg-perl/use-name'.
If there are just a few modules that fail syntax.t, you can ignore those
-by adding them to 'debian/tests/pkg-perl/skip-syntax'. The lines are
+by adding them to 'debian/tests/pkg-perl/syntax-skip'. The lines are
matched as fixed substrings (not regular expressions.) Empty lines and
#-style comments are supported.
The environment variables AUTOMATED_TESTING=1 and NONINTERACTIVE_TESTING=1
are set by default for smoke.t. You can override these and add others in
-'debian/tests/pkg-perl/env-smoke'.
+'debian/tests/pkg-perl/smoke-env'.
diff --git a/autopkgtest/scripts/build-deps.d/smoke b/autopkgtest/scripts/build-deps.d/smoke
index 0e19692..45e1c5a 100755
--- a/autopkgtest/scripts/build-deps.d/smoke
+++ b/autopkgtest/scripts/build-deps.d/smoke
@@ -4,7 +4,11 @@ set -e
TEMP=${ADTTMP:-${TMPDIR:-/tmp}}
TDIR=$(mktemp -d $TEMP/smokeXXXXXX)
-file_list=debian/tests/pkg-perl/test-files
+file_list=debian/tests/pkg-perl/smoke-files
+if [ ! -r $file_list ]; then
+ # backward compatibility squared for now
+ file_list=debian/tests/pkg-perl/test-files
+fi
if [ ! -r $file_list ]; then
# backward compatibility for now
file_list=debian/tests/test-files
@@ -13,7 +17,10 @@ fi
export AUTOMATED_TESTING=1
export NONINTERACTIVE_TESTING=1
-env_list=debian/tests/pkg-perl/env-smoke
+env_list=debian/tests/pkg-perl/smoke-env
+if [ ! -r $env_list ]; then
+ env_list=debian/tests/pkg-perl/env-smoke
+fi
if [ -r $env_list ]; then
eval $(sed '/^ *\(#\|$\)/d; s/^/export /' $env_list)
fi
@@ -27,7 +34,10 @@ else
[ -f test.pl ] && cp -a test.pl $TDIR
fi
-skip_list=debian/tests/pkg-perl/skip-smoke
+skip_list=debian/tests/pkg-perl/smoke-skip
+if [ ! -r $skip_list ]; then
+ skip_list=debian/tests/pkg-perl/skip-smoke
+fi
if [ -r $skip_list ]
then
egrep -v '^ *(#|$)' $skip_list | while read file; do
diff --git a/autopkgtest/scripts/runtime-deps-and-recommends.d/syntax.t b/autopkgtest/scripts/runtime-deps-and-recommends.d/syntax.t
index df49cb2..5b20fde 100755
--- a/autopkgtest/scripts/runtime-deps-and-recommends.d/syntax.t
+++ b/autopkgtest/scripts/runtime-deps-and-recommends.d/syntax.t
@@ -32,7 +32,8 @@ sub getpackages {
}
sub readskip {
- my $skip = "debian/tests/pkg-perl/skip-syntax";
+ my $skip = "debian/tests/pkg-perl/syntax-skip";
+ $skip = "debian/tests/pkg-perl/skip-syntax" if ! -r $skip;
-r $skip or return ();
open (S, '<', $skip)
or BAIL_OUT("$skip exists but can't be read");
diff --git a/autopkgtest/scripts/runtime-deps.d/use.t b/autopkgtest/scripts/runtime-deps.d/use.t
index b35deef..69382b4 100755
--- a/autopkgtest/scripts/runtime-deps.d/use.t
+++ b/autopkgtest/scripts/runtime-deps.d/use.t
@@ -21,8 +21,9 @@ usage(0) if $opts{h};
sub getmodule {
my $module;
- my $conffile = "debian/tests/pkg-perl/module-name";
- $conffile = "debian/tests/module-name" if ! -e $conffile; # backcompat
+ my $conffile = "debian/tests/pkg-perl/use-name";
+ $conffile = "debian/tests/pkg-perl/module-name" if ! -e $conffile; # backcompat
+ $conffile = "debian/tests/module-name" if ! -e $conffile; # backcompat squared
if ( -f $conffile ) {
open(M, "<", $conffile)
or BAIL_OUT("$conffile exists but can't be read");
--
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