[SCM] Debian package checker branch, master, updated. 2.5.10-31-g94e383e
The following commit has been merged in the master branch:
commit 94e383e14055c0a62dc381e8b078e000e3b7b9bf
Author: Niels Thykier <niels@thykier.net>
Date: Fri Jul 13 13:15:41 2012 +0200
t: Extend files-general and files-symlink
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/t/COVERAGE b/t/COVERAGE
index 26b7108..3f1a637 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2012-07-12
-Coverage: 822/964 (85.27%), w. legacy tests: 923/964 (95.75%)
+Last generated 2012-07-13
+Coverage: 826/964 (85.68%), w. legacy tests: 927/964 (96.16%)
The following tags are not tested by the test suite:
@@ -25,11 +25,7 @@ fields bad-menu-item
fields malformed-python-version
fields no-source-field
-files FSSTND-dir-in-var
-files compressed-symlink-with-wrong-ext
-files config-file-reserved
files debug-package-should-be-named-dbg
-files nfs-temporary-file-in-package
files non-standard-file-permissions-for-etc-init.d-script
files udeb-contains-documentation-file
diff --git a/t/tests/files-general/debian/debian/dirs b/t/tests/files-general/debian/debian/dirs
index 666af36..9ca0e47 100644
--- a/t/tests/files-general/debian/debian/dirs
+++ b/t/tests/files-general/debian/debian/dirs
@@ -1,3 +1,7 @@
+etc
+usr/doc
+usr/share/foo
usr/share/man/man1/random
+var/catman
var/lock/lintian
var/run/lintian
diff --git a/t/tests/files-general/debian/debian/rules b/t/tests/files-general/debian/debian/rules
index dbc4a63..1806e1d 100755
--- a/t/tests/files-general/debian/debian/rules
+++ b/t/tests/files-general/debian/debian/rules
@@ -1,16 +1,19 @@
#!/usr/bin/make -f
-tmp = $(CURDIR)/debian/$(shell dh_listpackages)
+tmp := $(CURDIR)/debian/$(shell dh_listpackages)
%:
dh $@
override_dh_install:
dh_install
- mkdir -p $(tmp)/usr/share/foo
+ echo "#fake conf file" > $(tmp)/etc/pam.conf
echo "Back-up file" > $(tmp)/usr/share/foo/file~
+ touch $(tmp)/usr/doc/FSSTND
touch $(tmp)/usr/share/foo/'*'
touch $(tmp)/usr/share/foo/'ws '
+ touch $(tmp)/usr/share/foo/.nfs-fake-tmpfile
+ touch $(tmp)/var/catman/do
override_dh_fixperms:
dh_fixperms
diff --git a/t/tests/files-general/desc b/t/tests/files-general/desc
index aabf83a..a39c520 100644
--- a/t/tests/files-general/desc
+++ b/t/tests/files-general/desc
@@ -3,8 +3,11 @@ Sequence: 6000
Version: 1.0
Description: Test tags for file paths, names, and modes
Test-For:
+ FSSTND-dir-in-usr
+ FSSTND-dir-in-var
backup-file-in-package
bad-perm-for-file-in-etc-sudoers.d
+ config-file-reserved
dir-or-file-in-var-lock
dir-or-file-in-var-run
duplicated-compressed-file
@@ -14,6 +17,7 @@ Test-For:
global-data-in-games-directory
icon-size-and-directory-name-mismatch
lengthy-symlink
+ nfs-temporary-file-in-package
non-conf-file-in-modprobe.d
non-standard-toplevel-dir
obsolete-comments-style-in-php-ini
diff --git a/t/tests/files-general/tags b/t/tests/files-general/tags
index c49b862..df6f91f 100644
--- a/t/tests/files-general/tags
+++ b/t/tests/files-general/tags
@@ -1,4 +1,7 @@
+E: files-general: FSSTND-dir-in-usr usr/doc/
+E: files-general: FSSTND-dir-in-var var/catman/
E: files-general: bad-perm-for-file-in-etc-sudoers.d etc/sudoers.d/sudotest 0644 != 0440
+E: files-general: config-file-reserved etc/pam.conf by libpam-runtime
E: files-general: dir-or-file-in-var-lock var/lock/lintian/
E: files-general: dir-or-file-in-var-run var/run/lintian/
E: files-general: executable-manpage usr/share/man/man5/foo.5.gz
@@ -17,10 +20,12 @@ I: files-general: package-contains-empty-directory usr/share/man/man1/random/
W: files-general: backup-file-in-package usr/share/foo/file~
W: files-general: executable-not-elf-or-script usr/share/man/man5/foo.5.gz
W: files-general: file-in-unusual-dir new-top-level-dir/file-in-new-top-level-dir
+W: files-general: file-in-unusual-dir var/catman/do
W: files-general: file-name-ends-in-whitespace usr/share/foo/ws
W: files-general: icon-size-and-directory-name-mismatch usr/share/apps/lintian/icons/hicolor/22x22/lintian-16x16.png 16x16
W: files-general: icon-size-and-directory-name-mismatch usr/share/apps/lintian/icons/hicolor/64x64/lintian-64x64.png 22x22
W: files-general: icon-size-and-directory-name-mismatch usr/share/icons/hicolor/22x22/apps/lintian-16x16.png 16x16
+W: files-general: nfs-temporary-file-in-package usr/share/foo/.nfs-fake-tmpfile
W: files-general: obsolete-comments-style-in-php-ini etc/php5/conf.d/php-foo.ini
W: files-general: raster-image-in-scalable-directory usr/share/icons/hicolor/scalable/apps/lintian-16x16.png
W: files-general: windows-devel-file-in-package usr/lib/foo/foo.vcproj
diff --git a/t/tests/files-symlinks/debian/debian/install b/t/tests/files-symlinks/debian/debian/install
index b0fb63f..a6716c8 100644
--- a/t/tests/files-symlinks/debian/debian/install
+++ b/t/tests/files-symlinks/debian/debian/install
@@ -5,3 +5,6 @@ symlinks/etc-lintian* usr/share/
symlinks/pkg*.conf usr/share/lintian/data/
symlinks/self-resursive usr/share/lintian/data/
symlinks/spurious usr/share/lintian/data/
+symlinks/comp-data usr/lib/lintian/data/
+
+tmp/comp-data.gz usr/share/lintian/data/
diff --git a/t/tests/files-symlinks/debian/debian/rules b/t/tests/files-symlinks/debian/debian/rules
index 96057b9..421a988 100644
--- a/t/tests/files-symlinks/debian/debian/rules
+++ b/t/tests/files-symlinks/debian/debian/rules
@@ -4,6 +4,8 @@
dh $@
override_dh_auto_build:
+ mkdir tmp
+ gzip -9c < data-file > tmp/comp-data.gz
mkdir symlinks/
ln -s ../../../../etc/lintian/pkg.conf symlinks/pkg-old.conf
ln -s ../..//..//..//../etc/lintian/pkg.conf symlinks/pkg.conf
@@ -11,9 +13,10 @@ override_dh_auto_build:
ln -s /etc/lintian/ symlinks/etc-lintian
ln -s / symlinks/self-resursive
ln -s ../../lintian-old/../lintian/data/data-file symlinks/spurious
+ ln -s ../../../share/lintian/data/comp-data.gz symlinks/comp-data
override_dh_auto_clean:
- rm -fr symlinks/
+ rm -fr symlinks/ tmp
override_dh_link:
# it will fix our symlinks and ruin the test, so skip it.
diff --git a/t/tests/files-symlinks/desc b/t/tests/files-symlinks/desc
index 3a07ba3..a116b47 100644
--- a/t/tests/files-symlinks/desc
+++ b/t/tests/files-symlinks/desc
@@ -3,6 +3,7 @@ Sequence: 6000
Version: 1.0
Description: Test tags about symlinks
Test-For:
+ compressed-symlink-with-wrong-ext
symlink-contains-spurious-segments
symlink-ends-with-slash
symlink-has-double-slash
@@ -10,4 +11,3 @@ Test-For:
symlink-is-self-recursive
symlink-should-be-absolute
symlink-should-be-relative
-
diff --git a/t/tests/files-symlinks/tags b/t/tests/files-symlinks/tags
index 4bfaed0..15ba7e3 100644
--- a/t/tests/files-symlinks/tags
+++ b/t/tests/files-symlinks/tags
@@ -1,3 +1,4 @@
+E: files-symlinks: compressed-symlink-with-wrong-ext usr/lib/lintian/data/comp-data ../../../share/lintian/data/comp-data.gz
E: files-symlinks: symlink-contains-spurious-segments usr/share/lintian/data/spurious ../../lintian-old/../lintian/data/data-file
E: files-symlinks: symlink-has-too-many-up-segments usr/share/lintian/data/pkg.conf ../..//..//..//../etc/lintian/pkg.conf
E: files-symlinks: symlink-should-be-absolute usr/share/lintian/data/pkg-old.conf ../../../../etc/lintian/pkg.conf
--
Debian package checker
Reply to: