[SCM] Debian package checker branch, master, updated. 2.5.3-63-g4f2c536
The following commit has been merged in the master branch:
commit 4f2c53693df5186954cdba4bbb23012d4aa0475a
Author: Niels Thykier <niels@thykier.net>
Date: Thu Oct 13 16:05:23 2011 +0200
Improve test coverage
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/t/COVERAGE b/t/COVERAGE
index 794df15..ec8d837 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2011-10-12
-Coverage: 734/938 (78.25%), w. legacy tests: 852/938 (90.83%)
+Last generated 2011-10-13
+Coverage: 749/938 (79.85%), w. legacy tests: 858/938 (91.47%)
The following tags are not tested by the test suite:
@@ -46,8 +46,6 @@ files nfs-temporary-file-in-package
files non-standard-file-permissions-for-etc-init.d-script
files old-app-defaults-directory
files old-style-example-dir
-files package-installs-font-to-usr-x11r6
-files package-installs-perllocal-pod
files package-uses-obsolete-file
files special-file
files udeb-contains-documentation-file
@@ -89,11 +87,6 @@ po-debconf missing-potfiles-in
po-debconf missing-templates-pot
po-debconf not-using-po-debconf
-scripts csh-considered-harmful
-scripts maintainer-script-needs-depends-on-adduser
-scripts maintainer-script-needs-depends-on-update-inetd
-scripts mknod-in-maintainer-script
-
shared-libs dev-pkg-without-shlib-symlink
shared-libs ldconfig-symlink-is-not-a-symlink
shared-libs ldconfig-symlink-referencing-wrong-file
@@ -144,21 +137,12 @@ debconf using-imperative-form-in-templates
debconf using-question-in-extended-description-in-templates
files desktop-file-in-wrong-dir
-files macos-ds-store-file-in-package
-files macos-resource-fork-file-in-package
-files package-contains-bts-control-dir
files package-contains-devhelp-file-without-symlink
files package-contains-hardlink
-files package-contains-linda-override
-files package-contains-readme-for-other-platform-or-distro
files package-contains-upstream-install-documentation
-files package-contains-vcs-control-dir
-files package-contains-vcs-control-file
files package-installs-packlist
files script-in-usr-share-doc
files script-with-language-extension
-files svk-commit-file-in-package
-files svn-commit-file-in-package
files use-of-compat-symlink
files windows-thumbnail-database-in-package
files wrong-file-owner-uid-or-gid
@@ -322,18 +306,9 @@ fields
filenames
bad-menu-file-name
desktop-file-in-wrong-dir
- macos-ds-store-file-in-package
- macos-resource-fork-file-in-package
- package-contains-bts-control-dir
package-contains-devhelp-file-without-symlink
- package-contains-linda-override
- package-contains-readme-for-other-platform-or-distro
- package-contains-vcs-control-dir
- package-contains-vcs-control-file
package-installs-packlist
script-not-executable
- svk-commit-file-in-package
- svn-commit-file-in-package
use-of-compat-symlink
windows-thumbnail-database-in-package
wrong-file-owner-uid-or-gid
diff --git a/t/tests/files-foo-in-bar/debian/debian/clean b/t/tests/files-foo-in-bar/debian/debian/clean
index c7730c2..9c3b89d 100644
--- a/t/tests/files-foo-in-bar/debian/debian/clean
+++ b/t/tests/files-foo-in-bar/debian/debian/clean
@@ -1,3 +1,4 @@
bar.1*
Bar.pm
bar.png
+perllocal.pod
diff --git a/t/tests/files-foo-in-bar/debian/debian/install b/t/tests/files-foo-in-bar/debian/debian/install
index 7bc4695..961eddd 100644
--- a/t/tests/files-foo-in-bar/debian/debian/install
+++ b/t/tests/files-foo-in-bar/debian/debian/install
@@ -23,6 +23,7 @@ bar usr/share/perl/
bar usr/share/vim/vimcurrent/
bar usr/share/vim/vim73/
bar usr/X11R6/bin
+bar usr/X11R6/lib/X11/fonts/
bar var/foo
bar var/lock/foo
bar var/run/foo
@@ -30,3 +31,5 @@ bar var/www/foo
Bar.pm usr/lib/perl5/Foo
bar.png usr/lib/files-foo-in-bar
+
+perllocal.pod usr/lib/perl-foo
diff --git a/t/tests/files-foo-in-bar/debian/debian/rules b/t/tests/files-foo-in-bar/debian/debian/rules
index 0a91b56..e50f149 100755
--- a/t/tests/files-foo-in-bar/debian/debian/rules
+++ b/t/tests/files-foo-in-bar/debian/debian/rules
@@ -7,6 +7,7 @@ override_dh_auto_build:
gzip --best bar.1
cp bar Bar.pm
cp bar bar.png
+ cp bar perllocal.pod
override_dh_auto_install:
dh_install bar.1.gz usr/X11R6/man/man1/
diff --git a/t/tests/files-foo-in-bar/desc b/t/tests/files-foo-in-bar/desc
index fa57951..748c1e9 100644
--- a/t/tests/files-foo-in-bar/desc
+++ b/t/tests/files-foo-in-bar/desc
@@ -20,10 +20,12 @@ Test-For:
package-contains-xvpics-dir
package-installs-file-to-usr-x11r6
package-installs-file-to-usr-x11r6-bin
+ package-installs-font-to-usr-x11r6
package-installs-into-etc-gconf-schemas
package-installs-into-etc-rc.boot
package-installs-into-etc-rc.d
package-installs-nonbinary-perl-in-usr-lib-perl5
+ package-installs-perllocal-pod
perl-module-in-core-directory
perl-module-in-core-directory
nested-examples-directory
diff --git a/t/tests/files-foo-in-bar/tags b/t/tests/files-foo-in-bar/tags
index 81a5de0..cf41d6c 100644
--- a/t/tests/files-foo-in-bar/tags
+++ b/t/tests/files-foo-in-bar/tags
@@ -22,11 +22,15 @@ E: files-foo-in-bar: nested-examples-directory usr/share/doc/files-foo-in-bar/ex
E: files-foo-in-bar: non-standard-dir-in-var var/foo/
E: files-foo-in-bar: package-contains-xvpics-dir usr/share/doc/files-foo-in-bar/.xvpics/
E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/
+E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/lib/
+E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/lib/X11/
E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/man/
E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/man/man1/
E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/man/man1/bar.1.gz
E: files-foo-in-bar: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/
E: files-foo-in-bar: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/bar
+E: files-foo-in-bar: package-installs-font-to-usr-x11r6 usr/X11R6/lib/X11/fonts/
+E: files-foo-in-bar: package-installs-font-to-usr-x11r6 usr/X11R6/lib/X11/fonts/bar
E: files-foo-in-bar: package-installs-into-etc-rc.boot etc/rc.boot/bar
E: files-foo-in-bar: package-installs-into-etc-rc.d etc/rc.d/bar
E: files-foo-in-bar: perl-module-in-core-directory usr/lib/perl/bar
@@ -47,6 +51,7 @@ W: files-foo-in-bar: image-file-in-usr-lib usr/lib/files-foo-in-bar/bar.png
W: files-foo-in-bar: non-standard-dir-in-usr usr/foo/
W: files-foo-in-bar: package-installs-into-etc-gconf-schemas etc/gconf/schemas/bar
W: files-foo-in-bar: package-installs-nonbinary-perl-in-usr-lib-perl5 usr/lib/perl5/Foo/Bar.pm
+W: files-foo-in-bar: package-installs-perllocal-pod usr/lib/perl-foo/perllocal.pod
W: files-foo-in-bar: third-party-package-in-python-dir usr/lib/python2.6/bar
W: files-foo-in-bar: vim-addon-within-vim-runtime-path usr/share/vim/vim73/bar
W: files-foo-in-bar: vim-addon-within-vim-runtime-path usr/share/vim/vimcurrent/bar
diff --git a/t/tests/files-package-contains-foo/debian/debian/rules b/t/tests/files-package-contains-foo/debian/debian/rules
new file mode 100644
index 0000000..6bede22
--- /dev/null
+++ b/t/tests/files-package-contains-foo/debian/debian/rules
@@ -0,0 +1,38 @@
+#!/usr/bin/make -f
+
+PKG :=$(shell dh_listpackages)
+SHARE:= debian/$(PKG)/usr/share
+DATA := $(SHARE)/$(PKG)
+DOC := $(SHARE)/doc/$(PKG)
+
+%:
+ dh $@
+
+override_dh_install:
+ dh_install
+ mkdir -p $(DOC) $(DATA)
+
+ # Vcs stuff
+ mkdir $(DATA)/.svn $(DATA)/.git
+ touch $(DATA)/.svn/file
+ touch $(DATA)/.git/file
+ touch $(DATA)/.gitignore
+ touch $(DATA)/svn-commit-yeehaa.tmp
+ touch $(DATA)/svk-commit-yeehaa.tmp
+
+ # bts control dir
+ mkdir $(DATA)/.be
+ touch $(DATA)/.be/file
+
+ # macos stuff
+ touch $(DATA)/.DS_Store
+ touch $(DATA)/._stuff
+
+ # Foreign READMEs
+ echo "Hallo World Mac" > $(DOC)/README.mac
+ echo "Hallo World Win" > $(DOC)/README.windows
+
+ # Linda override
+ mkdir -p $(SHARE)/linda/overrides
+ touch $(SHARE)/linda/overrides/$(PKG)
+
diff --git a/t/tests/files-package-contains-foo/desc b/t/tests/files-package-contains-foo/desc
new file mode 100644
index 0000000..c872ece
--- /dev/null
+++ b/t/tests/files-package-contains-foo/desc
@@ -0,0 +1,14 @@
+Testname: files-package-contains-foo
+Sequence: 6000
+Version: 1.0
+Description: Test tags about cruft in binary packages
+Test-For:
+ macos-ds-store-file-in-package
+ macos-resource-fork-file-in-package
+ package-contains-bts-control-dir
+ package-contains-linda-override
+ package-contains-readme-for-other-platform-or-distro
+ package-contains-vcs-control-dir
+ package-contains-vcs-control-file
+ svk-commit-file-in-package
+ svn-commit-file-in-package
diff --git a/t/tests/files-package-contains-foo/tags b/t/tests/files-package-contains-foo/tags
new file mode 100644
index 0000000..e1bf223
--- /dev/null
+++ b/t/tests/files-package-contains-foo/tags
@@ -0,0 +1,11 @@
+W: files-package-contains-foo: macos-ds-store-file-in-package usr/share/files-package-contains-foo/.DS_Store
+W: files-package-contains-foo: macos-resource-fork-file-in-package usr/share/files-package-contains-foo/._stuff
+W: files-package-contains-foo: package-contains-bts-control-dir usr/share/files-package-contains-foo/.be/
+W: files-package-contains-foo: package-contains-linda-override usr/share/linda/overrides/files-package-contains-foo
+W: files-package-contains-foo: package-contains-readme-for-other-platform-or-distro usr/share/doc/files-package-contains-foo/README.mac
+W: files-package-contains-foo: package-contains-readme-for-other-platform-or-distro usr/share/doc/files-package-contains-foo/README.windows
+W: files-package-contains-foo: package-contains-vcs-control-dir usr/share/files-package-contains-foo/.git/
+W: files-package-contains-foo: package-contains-vcs-control-dir usr/share/files-package-contains-foo/.svn/
+W: files-package-contains-foo: package-contains-vcs-control-file usr/share/files-package-contains-foo/.gitignore
+W: files-package-contains-foo: svk-commit-file-in-package usr/share/files-package-contains-foo/svk-commit-yeehaa.tmp
+W: files-package-contains-foo: svn-commit-file-in-package usr/share/files-package-contains-foo/svn-commit-yeehaa.tmp
diff --git a/t/tests/scripts-interpreters/debian/csh-shell b/t/tests/scripts-interpreters/debian/csh-shell
new file mode 100644
index 0000000..3e39c0b
--- /dev/null
+++ b/t/tests/scripts-interpreters/debian/csh-shell
@@ -0,0 +1 @@
+#!/bin/csh
diff --git a/t/tests/scripts-interpreters/debian/debian/control.in b/t/tests/scripts-interpreters/debian/debian/control.in
index 5a92cd5..c14dbca 100644
--- a/t/tests/scripts-interpreters/debian/debian/control.in
+++ b/t/tests/scripts-interpreters/debian/debian/control.in
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7.0.50~)
Package: {$srcpkg}
Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, python2.6
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, python2.6, csh
Description: {$description}
This is a test package designed to exercise some feature or tag of
Lintian. It is part of the Lintian test suite and may do very odd
diff --git a/t/tests/scripts-interpreters/debian/debian/install b/t/tests/scripts-interpreters/debian/debian/install
index 8f3a3c9..5496fa4 100644
--- a/t/tests/scripts-interpreters/debian/debian/install
+++ b/t/tests/scripts-interpreters/debian/debian/install
@@ -1,4 +1,5 @@
bin-env usr/bin/
+csh-shell usr/bin/
no-interpreter usr/bin/
not-absolute usr/bin/
python2.6 usr/bin/
diff --git a/t/tests/scripts-interpreters/debian/debian/links b/t/tests/scripts-interpreters/debian/debian/links
index b4b46e1..29a42f0 100644
--- a/t/tests/scripts-interpreters/debian/debian/links
+++ b/t/tests/scripts-interpreters/debian/debian/links
@@ -1,4 +1,5 @@
usr/share/man/man1/interpreters.1 usr/share/man/man1/bin-env.1
+usr/share/man/man1/interpreters.1 usr/share/man/man1/csh-shell.1
usr/share/man/man1/interpreters.1 usr/share/man/man1/no-interpreter.1
usr/share/man/man1/interpreters.1 usr/share/man/man1/not-absolute.1
usr/share/man/man1/interpreters.1 usr/share/man/man1/python2.6.1
diff --git a/t/tests/scripts-interpreters/desc b/t/tests/scripts-interpreters/desc
index 134baa0..44270d6 100644
--- a/t/tests/scripts-interpreters/desc
+++ b/t/tests/scripts-interpreters/desc
@@ -5,6 +5,7 @@ Description: Check various script interpreter issues
Skeleton: pedantic
Options: --pedantic -I -E
Test-For:
+ csh-considered-harmful
example-interpreter-in-usr-local
example-interpreter-not-absolute
example-script-uses-bin-env
diff --git a/t/tests/scripts-interpreters/tags b/t/tests/scripts-interpreters/tags
index 4db0275..fdb4b99 100644
--- a/t/tests/scripts-interpreters/tags
+++ b/t/tests/scripts-interpreters/tags
@@ -13,6 +13,7 @@ I: scripts-interpreters: example-wrong-path-for-interpreter usr/share/doc/script
P: scripts-interpreters: example-interpreter-in-usr-local usr/share/doc/scripts-interpreters/examples/usr-local #!/usr/local/bin/special-perl
P: scripts-interpreters: example-shell-script-fails-syntax-check usr/share/doc/scripts-interpreters/examples/syntax
P: scripts-interpreters: example-unusual-interpreter usr/share/doc/scripts-interpreters/examples/unusual #!/usr/bin/lintian
+W: scripts-interpreters: csh-considered-harmful usr/bin/csh-shell
W: scripts-interpreters: interpreter-not-absolute usr/bin/not-absolute #!perl
W: scripts-interpreters: script-uses-bin-env usr/bin/bin-env
W: scripts-interpreters: unusual-interpreter usr/bin/unusual #!/usr/bin/lintian
diff --git a/t/tests/scripts-maintainer-general/debian/debian/postinst b/t/tests/scripts-maintainer-general/debian/debian/postinst
index 4b35a09..66f725a 100755
--- a/t/tests/scripts-maintainer-general/debian/debian/postinst
+++ b/t/tests/scripts-maintainer-general/debian/debian/postinst
@@ -121,4 +121,8 @@ true `/usr/bin/foo "$0"`
# the || true. (Bug#541372)
ucf -p /etc/sensors3.conf || true
+if false ; then
+ mknod some thing
+fi
+
#DEBHELPER#
diff --git a/t/tests/scripts-maintainer-general/desc b/t/tests/scripts-maintainer-general/desc
index 01f925f..c861a19 100644
--- a/t/tests/scripts-maintainer-general/desc
+++ b/t/tests/scripts-maintainer-general/desc
@@ -19,6 +19,7 @@ Test-For:
maintainer-script-needs-depends-on-xml-core
maintainer-script-uses-dpkg-status-directly
maintainer-shell-script-fails-syntax-check
+ mknod-in-maintainer-script
possibly-insecure-handling-of-tmp-files-in-maintainer-script
read-in-maintainer-script
start-stop-daemon-in-maintainer-script
diff --git a/t/tests/scripts-maintainer-general/tags b/t/tests/scripts-maintainer-general/tags
index 525d859..5dbdee4 100644
--- a/t/tests/scripts-maintainer-general/tags
+++ b/t/tests/scripts-maintainer-general/tags
@@ -8,6 +8,7 @@ E: scripts-maintainer-general: maintainer-script-modifies-netbase-managed-file p
E: scripts-maintainer-general: maintainer-script-modifies-netbase-managed-file postinst:61 /etc/rpc
E: scripts-maintainer-general: maintainer-script-uses-dpkg-status-directly postinst
E: scripts-maintainer-general: maintainer-shell-script-fails-syntax-check prerm
+E: scripts-maintainer-general: mknod-in-maintainer-script postinst:125
E: scripts-maintainer-general: read-in-maintainer-script postinst:10
E: scripts-maintainer-general: suidregister-used-in-maintainer-script postinst
W: scripts-maintainer-general: command-with-path-in-maintainer-script postinst:117 /usr/bin/foo
diff --git a/t/tests/scripts-missing-dep/debian/debian/postinst b/t/tests/scripts-missing-dep/debian/debian/postinst
new file mode 100644
index 0000000..0341d9e
--- /dev/null
+++ b/t/tests/scripts-missing-dep/debian/debian/postinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if false ; then
+ adduser some user lalal
+ update-inetd some stuff
+fi
+
+#DEBHELPER#
+
diff --git a/t/tests/scripts-missing-dep/desc b/t/tests/scripts-missing-dep/desc
index 8d9126f..b589a37 100644
--- a/t/tests/scripts-missing-dep/desc
+++ b/t/tests/scripts-missing-dep/desc
@@ -5,6 +5,8 @@ Description: Check missing dep on various script interpreters
Test-For: wish-script-but-no-wish-dep
ruby-script-but-no-ruby-dep
gawk-script-but-no-gawk-dep
+ maintainer-script-needs-depends-on-adduser
+ maintainer-script-needs-depends-on-update-inetd
mawk-script-but-no-mawk-dep
php-script-but-no-phpX-cli-dep
python-script-but-no-python-dep
diff --git a/t/tests/scripts-missing-dep/tags b/t/tests/scripts-missing-dep/tags
index dce7299..4585ed7 100644
--- a/t/tests/scripts-missing-dep/tags
+++ b/t/tests/scripts-missing-dep/tags
@@ -5,3 +5,5 @@ E: scripts-missing-dep: python-script-but-no-python-dep usr/bin/python-script
E: scripts-missing-dep: ruby-script-but-no-ruby-dep usr/bin/ruby-script
E: scripts-missing-dep: tclsh-script-but-no-tclsh-dep usr/bin/tclsh-script
E: scripts-missing-dep: wish-script-but-no-wish-dep usr/bin/wish-script
+W: scripts-missing-dep: maintainer-script-needs-depends-on-adduser postinst
+W: scripts-missing-dep: maintainer-script-needs-depends-on-update-inetd postinst
--
Debian package checker
Reply to: