Hi, [Dropping the RFH bug report from Cc, at least for now.]
Axel Beckert wrote: > More test suite failures / How to run the test suite > ---------------------------------------------------- > > Additionally the test suite now fails due to > lib/Lintian/Check/Cruft.pm no more being tidy: > > Failed test 'Test::Perl::Critic for "lib/Lintian/Check/Cruft.pm"' > # at /usr/share/perl5/Test/Perl/Critic.pm line 121. > # > # lib/Lintian/Check/Cruft.pm:82:1:Use '{' and '}' to delimit multi-line > regexps > # lib/Lintian/Check/Cruft.pm:107:1:Use '{' and '}' to delimit multi-line > regexps > # lib/Lintian/Check/Cruft.pm:232:17:Useless use of $_ > # lib/Lintian/Check/Cruft.pm:238:1:Subroutine "full_text_check" does not > end with "return" > # lib/Lintian/Check/Cruft.pm:249:21:Subroutine called with "&" sigil > # lib/Lintian/Check/Cruft.pm:263:9:"%matchedkeyword" is declared but not > used > > (And after fixing these, some more return-related issues inside > full_text_check popped up.) > > I've tried to fix these. Will push that commit later today if the test > suite run currently running here locally doesn't find anything > related. (Usually such a run takes around 40 minutes here and I really > should go to bed now.) There were quite some differences in the test output afterwards: diff --git a/t/recipes/checks/cruft/cruft-autogenerated/eval/hints b/t/recipes/checks/cruft/cruft-autogenerated/eval/hints index 3003675de..4831c9deb 100644 --- a/t/recipes/checks/cruft/cruft-autogenerated/eval/hints +++ b/t/recipes/checks/cruft/cruft-autogenerated/eval/hints @@ -1,4 +1,2 @@ -cruft-autogenerated (source): source-contains-data-from-ieee-data-oui-db [src/oui.db/oui.db] -cruft-autogenerated (source): source-contains-autogenerated-visual-c++-file [src/visualc++/positive.cpp] cruft-autogenerated (source): source-contains-autogenerated-gperf-data [src/gperf/gperf.cpp] cruft-autogenerated (source): source-contains-autogenerated-gperf-data [src/gperf/gperf.c] diff --git a/t/recipes/checks/cruft/cruft-bad-php/eval/hints b/t/recipes/checks/cruft/cruft-bad-php/eval/hints index a674da015..8b1378917 100644 --- a/t/recipes/checks/cruft/cruft-bad-php/eval/hints +++ b/t/recipes/checks/cruft/cruft-bad-php/eval/hints @@ -1,3 +1 @@ -cruft-bad-php (source): license-problem-php-license [src/3_01.txt] -cruft-bad-php (source): license-problem-bad-php-license [src/2_02.txt] -cruft-bad-php (source): license-problem-bad-php-license [src/2_01.txt] + diff --git a/t/recipes/checks/cruft/cruft-cc-by-nc-sa/eval/hints b/t/recipes/checks/cruft/cruft-cc-by-nc-sa/eval/hints index 60ac3e73d..ef28c89a4 100644 --- a/t/recipes/checks/cruft/cruft-cc-by-nc-sa/eval/hints +++ b/t/recipes/checks/cruft/cruft-cc-by-nc-sa/eval/hints @@ -1,4 +1 @@ -cruft-cc-by-nc-sa (source): license-problem-cc-by-nc-sa [src/test.xml] -cruft-cc-by-nc-sa (source): license-problem-cc-by-nc-sa [src/test.svg] cruft-cc-by-nc-sa (source): license-problem-cc-by-nc-sa [src/copyright-header.html] -cruft-cc-by-nc-sa (source): license-problem-cc-by-nc-sa [src/ISI_export_format.html] diff --git a/t/recipes/checks/cruft/cruft-gfdl-invariants/eval/hints b/t/recipes/checks/cruft/cruft-gfdl-invariants/eval/hints index 22e8bd3c1..8b1378917 100644 --- a/t/recipes/checks/cruft/cruft-gfdl-invariants/eval/hints +++ b/t/recipes/checks/cruft/cruft-gfdl-invariants/eval/hints @@ -1,37 +1 @@ -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: without any invariant sections [src/oldfalsepositive/parsewiki.txt] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with the no invariant sections, with the no front-cover texts, and with no back-cover texts [src/oldfalsepositive/partedvariant.txt] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with the invariant sections being no invariant sections, with the front-cover texts being no front-cover texts, and with the back-cover texts being no back-cover texts [src/oldfalsepositive/oidentd.8] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with the front-cover texts being (none) and with the back-cover texts being (none) [src/oldfalsepositive/tla.txt] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with noinvariant sections , with no front-cover texts , and with no back-cover texts [src/oldfalsepositive/gnashfalsepositive.info] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections, with no front-cover texts, and with no back-cover texts [src/oldfalsepositive/patch-c0.diff] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections, with no front-cover texts, and with no back-cover texts [src/oldfalsepositive/make-stds.texi] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections, with no front-cover texts, and with no back-cover texts [src/oldfalsepositive/latexurl.tex] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections, with no front-cover texts, and with no back-cover texts [src/oldfalsepositive/hyphen-used-as-minus-sign.diff] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections, with no front-cover texts, and with no back-cover texts [src/oldfalsepositive/gfdltexcomments.tex] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections, with no front-cover texts, and with no back-cover texts [src/oldfalsepositive/findutilsok.c] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections, with no front-cover texts, and with no back-cover texts [src/oldfalsepositive/findsutilsokinlinenewline.c] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections, with no front-cover texts, and with no back-cover [src/oldfalsepositive/comments.po] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections, with no front-cover texts, and no back-cover texts [src/oldfalsepositive/texlive.tex] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections, with no front-cover texts and with no back-cover texts [src/oldfalsepositive/texignu.texi] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections, with no front-cover text, and with no back-cover texts [src/oldfalsepositive/clisp.txt] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections, no front-cover, and no back-cover texts [src/oldfalsepositive/mailutils.texi] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections, no front-cover and back-cover texts [src/oldfalsepositive/cflow.texi] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections, front-cover or back-cover texts [src/oldfalsepositive/opentoken.txt] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections, front- or back-cover texts [src/oldfalsepositive/variantdictfold.txt] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections, and no cover texts [src/oldfalsepositive/php-elisp.texi] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections texts [src/oldfalsepositive/sdlbasic.html] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections [src/oldfalsepositive/lilypond.texi] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections , with no front-cover texts , and with no back-cover texts [src/oldfalsepositive/gnashfalsepositive.xml] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections , with no front-cover texts , and with no back-cover texts [src/oldfalsepositive/gnashfalsepositive.html] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant sections , front-cover texts or back-cover texts , each as defined in the license [src/oldfalsepositive/quoteswithasdefined.xml] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no invariant section, no front-cover text and no back-cover text [src/oldfalsepositive/zeroisnotplural.texi] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: with no front-cover texts, and with no back-cover texts [src/oldfalsepositive/smbc.texi] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: there are no invariant sections [src/oldfalsepositive/libnss-pgsql.xml] -cruft-gfdl-invariants (source): license-problem-gfdl-non-official-text invariant part is: no invariant sections, no front-cover texts, no back-cover texts [src/oldfalsepositive/normalbkchem.texi] -cruft-gfdl-invariants (source): license-problem-gfdl-invariants-empty [src/emptybis.texi] -cruft-gfdl-invariants (source): license-problem-gfdl-invariants-empty [src/empty.texi] -cruft-gfdl-invariants (source): license-problem-gfdl-invariants invariant part is: with the invariant sections being just gnu manifesto with no front-cover texts, and with no back-cover texts [src/invariant.txt] -cruft-gfdl-invariants (source): license-problem-gfdl-invariants invariant part is: with the invariant sections being funding free software the front-cover texts being (a) (see below), and with the back-cover texts being (b) (see below) [src/frontback.html] -cruft-gfdl-invariants (source): license-problem-gfdl-invariants invariant part is: with the invariant sections being (l gnu general public license (r and (l funding free software (r the front-cover texts being (a) (see below), and with the back-cover texts being (b) (see below) [src/oldmanpagesgfdlproblem.1] -cruft-gfdl-invariants (source): license-problem-gfdl-invariants invariant part is: with no invariant sections, with the front-cover texts being a gnu manual, and with the back-cover texts as in (a) below [src/autoconf.texi] -cruft-gfdl-invariants (source): license-problem-gfdl-invariants invariant part is: with no invariant sections, with the front-cover texts being a debian manual , and with the back-cover texts as in (a) below [src/frontback.texi] + diff --git a/t/recipes/checks/cruft/cruft-minified-js/eval/hints b/t/recipes/checks/cruft/cruft-minified-js/eval/hints index 09582a1c6..6a5aa0b0f 100644 --- a/t/recipes/checks/cruft/cruft-minified-js/eval/hints +++ b/t/recipes/checks/cruft/cruft-minified-js/eval/hints @@ -1,3 +1,2 @@ cruft-minified-js (source): source-contains-prebuilt-pandoc-documentation [oldfalsepositives/pandoc/] cruft-minified-js (source): source-contains-browserified-javascript code fragment:CODE -cruft-minified-js (source): embedded-script-includes-copyright-statement extract of copyright statement: COPYRIGHT diff --git a/t/recipes/checks/cruft/cruft-non-free-rfc/eval/hints b/t/recipes/checks/cruft/cruft-non-free-rfc/eval/hints index 9a2bd8a73..6588c5761 100644 --- a/t/recipes/checks/cruft/cruft-non-free-rfc/eval/hints +++ b/t/recipes/checks/cruft/cruft-non-free-rfc/eval/hints @@ -1,2 +1 @@ -cruft-non-free-rfc (source): license-problem-non-free-RFC-BCP78 [src/bcp78.txt] cruft-non-free-rfc (source): license-problem-non-free-RFC [src/rfc.txt] diff --git a/t/recipes/checks/cruft/cruft-non-free-utf/eval/hints b/t/recipes/checks/cruft/cruft-non-free-utf/eval/hints index 0df295ba7..8b1378917 100644 --- a/t/recipes/checks/cruft/cruft-non-free-utf/eval/hints +++ b/t/recipes/checks/cruft/cruft-non-free-utf/eval/hints @@ -1 +1 @@ -cruft-non-free-utf (source): license-problem-convert-utf-code [src/bad.c] + diff --git a/t/recipes/checks/cruft/cruft-sphinx-documentation/eval/hints b/t/recipes/checks/cruft/cruft-sphinx-documentation/eval/hints index cd11c3522..8b1378917 100644 --- a/t/recipes/checks/cruft/cruft-sphinx-documentation/eval/hints +++ b/t/recipes/checks/cruft/cruft-sphinx-documentation/eval/hints @@ -1 +1 @@ -cruft-sphinx-documentation (source): source-contains-prebuilt-sphinx-documentation [src/sphinx-1.22/_build/html/] + diff --git a/t/recipes/checks/fields/mail-address/fields-maintainer-general/eval/hints b/t/recipes/checks/fields/mail-address/fields-maintainer-general/eval/hints index e0cb01f1d..4e30932b5 100644 --- a/t/recipes/checks/fields/mail-address/fields-maintainer-general/eval/hints +++ b/t/recipes/checks/fields/mail-address/fields-maintainer-general/eval/hints @@ -1,10 +1,10 @@ fields-maintainer-general (source): no-phrase Uploaders lintian-ma...@debian.org fields-maintainer-general (source): no-phrase Maintainer lintian-ma...@debian.org +fields-maintainer-general (source): malformed-contact Uploaders Mr. Missing Comma <m...@comma.com> fields-maintainer-general (source): malformed-contact Uploaders fields-maintainer-general (source): mail-contact Uploaders lintian-ma...@debian.org fields-maintainer-general (source): mail-contact Uploaders "Ubuntu Developers" <ubuntu-devel-disc...@lists.ubuntu.com> fields-maintainer-general (source): mail-contact Uploaders "Russ Allbery" <r...@debian.org> -fields-maintainer-general (source): mail-contact Uploaders "Mr. Missing Comma" <m...@comma.com> fields-maintainer-general (source): mail-contact Uploaders "Double comma" <dou...@comma.com> fields-maintainer-general (source): mail-contact Maintainer lintian-ma...@debian.org fields-maintainer-general (source): mail-address-loops-or-bounces Uploaders ubuntu-devel-disc...@lists.ubuntu.com diff --git a/t/recipes/checks/fields/mail-address/missing-closing-bracket/eval/hints b/t/recipes/checks/fields/mail-address/missing-closing-bracket/eval/hints index 26ac094be..db204a701 100644 --- a/t/recipes/checks/fields/mail-address/missing-closing-bracket/eval/hints +++ b/t/recipes/checks/fields/mail-address/missing-closing-bracket/eval/hints @@ -1,3 +1,3 @@ -missing-closing-bracket (source): mail-contact Maintainer Work <m...@work.com> -missing-closing-bracket (changes): mail-contact Maintainer Work <m...@work.com> -missing-closing-bracket (binary): mail-contact Maintainer Work <m...@work.com> +missing-closing-bracket (source): malformed-contact Maintainer Work <m...@work.com +missing-closing-bracket (changes): malformed-contact Maintainer Work <m...@work.com +missing-closing-bracket (binary): malformed-contact Maintainer Work <m...@work.com So I rather pushed this to a feature branch instead: https://salsa.debian.org/lintian/lintian/-/commits/fix-cruft-perlcritic Bastien: I'd be happy if you could review especially the changes at https://salsa.debian.org/lintian/lintian/-/commit/a2df32c0687512b527e82f5ddf29837560da4a92 Thanks in advance! Regards, Axel -- ,''`. | Axel Beckert <a...@debian.org>, https://people.debian.org/~abe/ : :' : | Debian Developer, ftp.ch.debian.org Admin `. `' | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5 `- | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
signature.asc
Description: PGP signature