This is an automated email from the git hooks/post-receive script. lamby pushed a commit to branch master in repository lintian.
commit 7c939b01a8a8c83fddd1682a050213bec6422672 Author: Chris Lamb <[email protected]> Date: Sat Jul 29 22:57:28 2017 +0100 Restrict (and rename) unnecessary-testsuite-header to only warn about "Testsuite: autopkgtest". --- checks/testsuite.desc | 6 +++--- checks/testsuite.pm | 4 ++-- debian/changelog | 4 ++-- t/tests/testsuite-general/desc | 2 +- .../debian/debian/control.in | 0 .../debian/debian/tests/control | 0 .../debian/debian/tests/test-1 | 0 t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/desc | 5 +++++ t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/tags | 1 + t/tests/testsuite-unnecessary-testsuite-header/desc | 5 ----- t/tests/testsuite-unnecessary-testsuite-header/tags | 1 - 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/checks/testsuite.desc b/checks/testsuite.desc index c9a2454..cb3e7a6 100644 --- a/checks/testsuite.desc +++ b/checks/testsuite.desc @@ -140,11 +140,11 @@ Info: This package does not declare a test suite. Having a test suite helps with For more information on how to add functional tests to your package, browse to https://ci.debian.net/doc/. -Tag: unnecessary-testsuite-header +Tag: unnecessary-testsuite-autopkgtest-header Severity: normal Certainty: certain -Info: You do not need to specify a <tt>Testsuite</tt> field if a - <tt>debian/tests/control</tt> file exists. It is automatically added by +Info: You do not need to specify a <tt>Testsuite: autopkgtest</tt> field if + a <tt>debian/tests/control</tt> file exists. It is automatically added by dpkg-source(1) since dpkg 1.17.1. . Please remove this line from your <tt>debian/control</tt> file. diff --git a/checks/testsuite.pm b/checks/testsuite.pm index cd71aba..38871e3 100644 --- a/checks/testsuite.pm +++ b/checks/testsuite.pm @@ -104,8 +104,8 @@ sub run { check_control_contents($info, $path); } - tag 'unnecessary-testsuite-header' - if defined($info->source_field('testsuite')); + tag 'unnecessary-testsuite-autopkgtest-header' + if $info->source_field('testsuite') // '' eq 'autopkgtest'; } return; } diff --git a/debian/changelog b/debian/changelog index 74e1413..9532644 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,8 +26,8 @@ lintian (2.5.53) UNRELEASED; urgency=medium + [CL] Remove recommendations to add a "Testsuite: autopkgtest" field to debian/control as it is added when needed by dpkg-source(1) since dpkg 1.17.1. (Closes: #865531) - + [CL] Warn if we see an unnecessary "Testsuite" header in - debian/control. + + [CL] Warn if we see an unnecessary "Testsuite: autopkgtest" header + in debian/control. * commands/lintian.pm: + [CL] Apply patch from Maia Everett to avoid British spelling when diff --git a/t/tests/testsuite-general/desc b/t/tests/testsuite-general/desc index 07ddc78..66a43df 100644 --- a/t/tests/testsuite-general/desc +++ b/t/tests/testsuite-general/desc @@ -4,7 +4,7 @@ Description: General tests of the autopkgtest control file Options: -I -E --pedantic Skeleton: pedantic Test-Against: - unnecessary-testsuite-header + unnecessary-testsuite-autopkgtest-header Test-For: debian-tests-control-uses-national-encoding exclusive-runtime-tests-field diff --git a/t/tests/testsuite-unnecessary-testsuite-header/debian/debian/control.in b/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/debian/debian/control.in similarity index 100% rename from t/tests/testsuite-unnecessary-testsuite-header/debian/debian/control.in rename to t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/debian/debian/control.in diff --git a/t/tests/testsuite-unnecessary-testsuite-header/debian/debian/tests/control b/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/debian/debian/tests/control similarity index 100% rename from t/tests/testsuite-unnecessary-testsuite-header/debian/debian/tests/control rename to t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/debian/debian/tests/control diff --git a/t/tests/testsuite-unnecessary-testsuite-header/debian/debian/tests/test-1 b/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/debian/debian/tests/test-1 similarity index 100% rename from t/tests/testsuite-unnecessary-testsuite-header/debian/debian/tests/test-1 rename to t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/debian/debian/tests/test-1 diff --git a/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/desc b/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/desc new file mode 100644 index 0000000..357ede5 --- /dev/null +++ b/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/desc @@ -0,0 +1,5 @@ +Testname: testsuite-unnecessary-testsuite-autopkgtest-header +Version: 1.0 +Description: Tests for unnecessary Testsuite header in debian/control +Test-For: + unnecessary-testsuite-autopkgtest-header diff --git a/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/tags b/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/tags new file mode 100644 index 0000000..aa38683 --- /dev/null +++ b/t/tests/testsuite-unnecessary-testsuite-autopkgtest-header/tags @@ -0,0 +1 @@ +W: testsuite-unnecessary-testsuite-autopkgtest-header source: unnecessary-testsuite-autopkgtest-header diff --git a/t/tests/testsuite-unnecessary-testsuite-header/desc b/t/tests/testsuite-unnecessary-testsuite-header/desc deleted file mode 100644 index e3f2e5a..0000000 --- a/t/tests/testsuite-unnecessary-testsuite-header/desc +++ /dev/null @@ -1,5 +0,0 @@ -Testname: testsuite-unnecessary-testsuite-header -Version: 1.0 -Description: Tests for unnecessary Testsuite header in debian/control -Test-For: - unnecessary-testsuite-header diff --git a/t/tests/testsuite-unnecessary-testsuite-header/tags b/t/tests/testsuite-unnecessary-testsuite-header/tags deleted file mode 100644 index d6afae6..0000000 --- a/t/tests/testsuite-unnecessary-testsuite-header/tags +++ /dev/null @@ -1 +0,0 @@ -W: testsuite-unnecessary-testsuite-header source: unnecessary-testsuite-header -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
