[lintian] 01/02: t: Use a different tag for the overrides-* test
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 69bfbd5d9fe4d0cbb4cc38382080aacc8fa82f38
Author: Niels Thykier <niels@thykier.net>
Date: Mon May 25 10:17:00 2015 +0200
t: Use a different tag for the overrides-* test
As hyphen-used-as-minus-sign is being retired, migrate the test to use
a different tag.
Signed-off-by: Niels Thykier <niels@thykier.net>
---
.../debian/overrides-shown.lintian-overrides | 14 ++++++------
t/tests/overrides-shown/debian/foo.1 | 24 ++++++++++-----------
t/tests/overrides-shown/tags | 25 ++++++++++++----------
.../debian/debian/overrides.lintian-overrides | 21 +++++++++++-------
t/tests/overrides/debian/foo.1 | 24 ++++++++++-----------
t/tests/overrides/tags | 8 +++----
6 files changed, 62 insertions(+), 54 deletions(-)
diff --git a/t/tests/overrides-shown/debian/debian/overrides-shown.lintian-overrides b/t/tests/overrides-shown/debian/debian/overrides-shown.lintian-overrides
index f8df12f..dd2884b 100644
--- a/t/tests/overrides-shown/debian/debian/overrides-shown.lintian-overrides
+++ b/t/tests/overrides-shown/debian/debian/overrides-shown.lintian-overrides
@@ -5,13 +5,13 @@
# override without extra information
manpage-has-bad-whatis-entry
# Architecture specific override
-[i386]: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:6
-[!i386]: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:6
+[i386]: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:6 /usr/etc/
+[!i386]: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:6 /usr/etc/
# exact extra information
-hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:4
+FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:4 /usr/dict/
# These are wildcard overrides
-hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:2*
-hyphen-used-as-minus-sign */foo.1.gz:5
-hyphen-used-as-minus-sign */foo.1.gz:3*
+FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:2*
+FSSTND-dir-in-manual-page */foo.1.gz:5 /usr/doc/
+FSSTND-dir-in-manual-page */foo.1.gz:3*
-hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz * more occurrences not shown
+#FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz * more occurrences not shown
diff --git a/t/tests/overrides-shown/debian/foo.1 b/t/tests/overrides-shown/debian/foo.1
index e42b76d..233a578 100644
--- a/t/tests/overrides-shown/debian/foo.1
+++ b/t/tests/overrides-shown/debian/foo.1
@@ -1,32 +1,32 @@
.TH FOO 1 "Sep 13, 2008" "Debian GNU/Linux"
.SH DESCRIPTION
--a
--b
--c
+/usr/dict/
+/usr/doc/
+/usr/etc/
--d
--e
--f
+/usr/info/
+/usr/man/
+/usr/adm/
--g
--h
--i
+/var/adm/
+/var/catman/
+/var/named/
--j
--k
--l
+/var/nis/
+/var/preserve/
+/usr/preserve/
diff --git a/t/tests/overrides-shown/tags b/t/tests/overrides-shown/tags
index 2981ef3..2cbb15c 100644
--- a/t/tests/overrides-shown/tags
+++ b/t/tests/overrides-shown/tags
@@ -1,20 +1,23 @@
N: override without extra information
O: overrides-shown: manpage-has-bad-whatis-entry usr/share/man/man1/foo.1.gz
N: exact extra information
-O: overrides-shown: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:4
+O: overrides-shown: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:4 /usr/dict/
N: These are wildcard overrides
-O: overrides-shown: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:5
+O: overrides-shown: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:5 /usr/doc/
N: Architecture specific override
-O: overrides-shown: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:6
-I: overrides-shown: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:12
-I: overrides-shown: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:13
-I: overrides-shown: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:14
+O: overrides-shown: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:6 /usr/etc/
+I: overrides-shown: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:12 /usr/info/
+I: overrides-shown: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:13 /usr/man/
+I: overrides-shown: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:14 /usr/adm/
N: These are wildcard overrides
-O: overrides-shown: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:21
+O: overrides-shown: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:21 /var/adm/
N: These are wildcard overrides
-O: overrides-shown: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:22
+O: overrides-shown: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:22 /var/catman/
N: These are wildcard overrides
-O: overrides-shown: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:23
+O: overrides-shown: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:23 /var/named/
N: These are wildcard overrides
-O: overrides-shown: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:30
-O: overrides-shown: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz 2 more occurrences not shown
+O: overrides-shown: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:30 /var/nis/
+N: These are wildcard overrides
+O: overrides-shown: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:31 /var/preserve/
+N: These are wildcard overrides
+O: overrides-shown: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:32 /usr/preserve/
diff --git a/t/tests/overrides/debian/debian/overrides.lintian-overrides b/t/tests/overrides/debian/debian/overrides.lintian-overrides
index eff3986..dd2884b 100644
--- a/t/tests/overrides/debian/debian/overrides.lintian-overrides
+++ b/t/tests/overrides/debian/debian/overrides.lintian-overrides
@@ -1,12 +1,17 @@
+# This comment will not appear in the output, also the last
+# tag should not have a comment due to the empty line between
+# it and the one before it.
+
# override without extra information
manpage-has-bad-whatis-entry
# Architecture specific override
-[i386]: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:6
-[!i386]: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:6
+[i386]: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:6 /usr/etc/
+[!i386]: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:6 /usr/etc/
# exact extra information
-hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:4
-# wildcards
-hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:2*
-hyphen-used-as-minus-sign */foo.1.gz:5
-hyphen-used-as-minus-sign */foo.1.gz:3*
-hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz * more occurrences not shown
+FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:4 /usr/dict/
+# These are wildcard overrides
+FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:2*
+FSSTND-dir-in-manual-page */foo.1.gz:5 /usr/doc/
+FSSTND-dir-in-manual-page */foo.1.gz:3*
+
+#FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz * more occurrences not shown
diff --git a/t/tests/overrides/debian/foo.1 b/t/tests/overrides/debian/foo.1
index e42b76d..233a578 100644
--- a/t/tests/overrides/debian/foo.1
+++ b/t/tests/overrides/debian/foo.1
@@ -1,32 +1,32 @@
.TH FOO 1 "Sep 13, 2008" "Debian GNU/Linux"
.SH DESCRIPTION
--a
--b
--c
+/usr/dict/
+/usr/doc/
+/usr/etc/
--d
--e
--f
+/usr/info/
+/usr/man/
+/usr/adm/
--g
--h
--i
+/var/adm/
+/var/catman/
+/var/named/
--j
--k
--l
+/var/nis/
+/var/preserve/
+/usr/preserve/
diff --git a/t/tests/overrides/tags b/t/tests/overrides/tags
index c3eb94a..ce876f0 100644
--- a/t/tests/overrides/tags
+++ b/t/tests/overrides/tags
@@ -1,4 +1,4 @@
-I: overrides: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:12
-I: overrides: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:13
-I: overrides: hyphen-used-as-minus-sign usr/share/man/man1/foo.1.gz:14
-N: 9 tags overridden (1 warning, 8 info)
+I: overrides: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:12 /usr/info/
+I: overrides: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:13 /usr/man/
+I: overrides: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:14 /usr/adm/
+N: 10 tags overridden (1 warning, 9 info)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: