[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: Fix FTBFS in perlcritic runner with Test::Perl::Critic 1.03



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

abe pushed a commit to branch master
in repository lintian.

commit a5baafce0757b846a344c08736d95f7b7da75ac3
Author: Axel Beckert <abe@deuxchevaux.org>
Date:   Mon Aug 17 02:06:41 2015 +0200

    Fix FTBFS in perlcritic runner with Test::Perl::Critic 1.03
---
 debian/changelog              |  3 +++
 t/scripts/01-critic/runner.pl | 20 +++-----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef38953..47b7c16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ lintian (2.5.37) UNRELEASED; urgency=medium
     + [BR] Support tag renaming. Warn about renamed
       tags.
 
+  * t/scripts/01-critic/runner.pl:
+    + [AB] Fix FTBFS in perlcritic runner with Test::Perl::Critic 1.03
+
  -- Bastien Roucariès <roucaries.bastien+debian@gmail.com>  Sat, 15 Aug 2015 23:49:50 +0200
 
 lintian (2.5.36.1) unstable; urgency=medium
diff --git a/t/scripts/01-critic/runner.pl b/t/scripts/01-critic/runner.pl
index 86f2c26..15f1295 100755
--- a/t/scripts/01-critic/runner.pl
+++ b/t/scripts/01-critic/runner.pl
@@ -42,23 +42,9 @@ exit(0);
 
 sub run_critic {
     my (@args) = @_;
-    plan tests => scalar(@args);
-    for my $arg (@args) {
-        if (-d $arg) {
-
-            # all_critic_ok emits its own plan, so run it in a subtest
-            # so we can just count it as "one" test.
-            subtest "Critic all code in $arg" => sub {
-                all_critic_ok($arg);
-            };
-        }elsif (-f _ ) {
-            critic_ok($arg);
-        }else {
-            print STDERR "N: $arg\n";
-            die "$arg does not exists\n" if not -e _;
-            die "$arg is of an unsupported file type\n";
-        }
-    }
+
+    all_critic_ok(@args);
+
     # For some reason, perltidy has started to leave behind a
     # "perltidy.LOG" which is rather annoying.  Lets have the tests
     # unconditionally kill those.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: