[SCM] Debian package checker branch, master, updated. 2.5.10-24-g7356610
The following commit has been merged in the master branch:
commit 735661069a482c161ef6b61e062fb5bb9d041ce7
Author: Niels Thykier <niels@thykier.net>
Date: Wed Jul 11 21:46:03 2012 +0200
Add some menu-format icon tests
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/t/COVERAGE b/t/COVERAGE
index efbaf8e..f69747a 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2012-07-10
-Coverage: 812/964 (84.23%), w. legacy tests: 917/964 (95.12%)
+Last generated 2012-07-11
+Coverage: 815/964 (84.54%), w. legacy tests: 920/964 (95.44%)
The following tags are not tested by the test suite:
@@ -41,9 +41,6 @@ init.d file-in-etc-rc.d-marked-as-conffile
manpages FSSTND-dir-in-manual-page
manpages bad-so-link-within-manual-page
-menu-format menu-icon-cannot-be-parsed
-menu-format menu-icon-not-in-xpm-format
-menu-format menu-icon-too-big
menu-format menu-item-contains-unknown-tag
menu-format menu-item-needs-dwww
menu-format old-format-menu-file
diff --git a/t/tests/menu-format-general/debian/broken.xpm b/t/tests/menu-format-general/debian/broken.xpm
new file mode 100644
index 0000000..2fa612c
--- /dev/null
+++ b/t/tests/menu-format-general/debian/broken.xpm
@@ -0,0 +1 @@
+/* Pretend to be an XPM file without being it */
diff --git a/t/tests/menu-format-general/debian/debian/menu-cmd.install b/t/tests/menu-format-general/debian/debian/menu-cmd.install
new file mode 100644
index 0000000..b8f1c81
--- /dev/null
+++ b/t/tests/menu-format-general/debian/debian/menu-cmd.install
@@ -0,0 +1,2 @@
+*.xpm usr/share/pixmaps/
+pargs.png usr/share/pixmaps/
diff --git a/t/tests/menu-format-general/debian/debian/menu-cmd.menu b/t/tests/menu-format-general/debian/debian/menu-cmd.menu
index 2f8449a..78b9cae 100644
--- a/t/tests/menu-format-general/debian/debian/menu-cmd.menu
+++ b/t/tests/menu-format-general/debian/debian/menu-cmd.menu
@@ -1,3 +1,4 @@
?package(menu-cmd):needs="X11" section="Applications/Programming"\
- title="pargs (icon none)" command="/usr/bin/not-here"\
- longtitle="Argument printer"
+ title="pargs (png icon)" command="/usr/bin/not-here"\
+ longtitle="Argument printer" icon16x16="pargs.png" \
+ icon="broken.xpm" icon32x32="too-large.xpm"
diff --git a/reporting/lintian-dummy.cfg b/t/tests/menu-format-general/debian/pargs.png
similarity index 100%
copy from reporting/lintian-dummy.cfg
copy to t/tests/menu-format-general/debian/pargs.png
diff --git a/t/tests/menu-format-general/debian/too-large.xpm b/t/tests/menu-format-general/debian/too-large.xpm
new file mode 100644
index 0000000..1403c5d
--- /dev/null
+++ b/t/tests/menu-format-general/debian/too-large.xpm
@@ -0,0 +1,10 @@
+/* XPM */
+
+/*
+ This is a fake XPM file - it has just enough to fool Lintian into
+ believing this is a 256x256 image...
+ */
+
+ "256 256 10 10"
+
+ /* Lintian is not too bright... :P */
diff --git a/t/tests/menu-format-general/desc b/t/tests/menu-format-general/desc
index a703c42..e380e89 100644
--- a/t/tests/menu-format-general/desc
+++ b/t/tests/menu-format-general/desc
@@ -6,7 +6,10 @@ Test-For:
bad-test-in-menu-item
duplicated-tag-in-menu-item
menu-command-not-in-package
+ menu-icon-cannot-be-parsed
menu-icon-missing
+ menu-icon-not-in-xpm-format
+ menu-icon-too-big
menu-item-creates-new-root-section
menu-item-creates-new-section
menu-item-uses-apps-games-section
diff --git a/t/tests/menu-format-general/tags b/t/tests/menu-format-general/tags
index 6ca7d24..5ca3ae0 100644
--- a/t/tests/menu-format-general/tags
+++ b/t/tests/menu-format-general/tags
@@ -1,10 +1,13 @@
E: menu-broken: bad-test-in-menu-item usr/share/menu/menu-broken:4
E: menu-broken: unparsable-menu-item usr/share/menu/menu-broken:12
+E: menu-cmd: menu-icon-not-in-xpm-format pargs.png
+E: menu-cmd: menu-icon-too-big too-large.xpm: 256x256 > 32x32
E: menu-section: menu-item-creates-new-root-section Root usr/share/menu/menu-section:3
E: menu-section: non-wm-in-windowmanager-menu-section x11 usr/share/menu/menu-section:15
W: menu-broken: duplicated-tag-in-menu-item usr/share/menu/menu-broken longtitle:12
W: menu-broken: pkg-not-in-package-test wrong-package usr/share/menu/menu-broken
-W: menu-cmd: menu-command-not-in-package usr/share/menu/menu-cmd:3 usr/bin/not-here
+W: menu-cmd: menu-command-not-in-package usr/share/menu/menu-cmd:4 usr/bin/not-here
+W: menu-cmd: menu-icon-cannot-be-parsed broken.xpm: looking for XPM header
W: menu-none: menu-icon-missing non-existent.xpm
W: menu-none: menu-icon-missing usr/share/menu-none/non-existent16.xpm
W: menu-none: menu-icon-missing usr/share/menu-none/non-existent32.xpm
--
Debian package checker
Reply to: