[SCM] Debian package checker branch, master, updated. 2.5.0-rc1-26-g15b6113
The following commit has been merged in the master branch:
commit 15b61137670a1fc4a1014867d9dced451aa08dc6
Author: Niels Thykier <niels@thykier.net>
Date: Fri Mar 25 22:42:29 2011 +0100
Further improved menu-format testing coverage
diff --git a/t/COVERAGE b/t/COVERAGE
index 8dad03f..6987165 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -116,9 +116,7 @@ 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-creates-new-root-section
menu-format menu-item-needs-dwww
-menu-format menu-item-uses-apps-games-section
menu-format old-format-menu-file
menu-format pkg-not-in-package-test
menu-format whitespace-after-continuation-character
@@ -281,10 +279,8 @@ init.d prerm-calls-updaterc.d
menu-format deprecated-kdelnk-file
menu-format desktop-contains-deprecated-header
menu-format desktop-entry-missing-required-key
-menu-format menu-item-creates-new-section
menu-format menu-item-missing-required-tag
menu-format menu-item-needs-tag-has-unknown-value
-menu-format menu-item-uses-apps-section
menu-format menu-item-uses-windowmanagers-section
menu-format non-wm-in-windowmanager-menu-section
menu-format non-wm-module-in-wm-modules-menu-section
@@ -380,10 +376,8 @@ binary
file-name-ends-in-whitespace
lengthy-symlink
menu-file-in-usr-lib
- menu-item-creates-new-section
menu-item-missing-required-tag
menu-item-needs-tag-has-unknown-value
- menu-item-uses-apps-section
menu-item-uses-windowmanagers-section
menu-method-should-include-menu-h
non-wm-in-windowmanager-menu-section
diff --git a/t/tests/menu-format-general/debian/debian/control.in b/t/tests/menu-format-general/debian/debian/control.in
index 430d56a..1a240a1 100644
--- a/t/tests/menu-format-general/debian/debian/control.in
+++ b/t/tests/menu-format-general/debian/debian/control.in
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7.0.50~)
Package: menu-none
Architecture: all
-Depends: $\{misc:Depends\},
+Depends: $\{misc:Depends\}
Description: {$description} (no icon)
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
@@ -18,7 +18,7 @@ Description: {$description} (no icon)
Package: menu-cmd
Architecture: all
-Depends: $\{misc:Depends\},
+Depends: $\{misc:Depends\}
Description: {$description} (cmd)
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
@@ -29,7 +29,7 @@ Description: {$description} (cmd)
Package: menu-broken
Architecture: all
-Depends: $\{misc:Depends\},
+Depends: $\{misc:Depends\}
Description: {$description} (broken)
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
@@ -37,3 +37,14 @@ Description: {$description} (broken)
be an empty package.
.
Test for broken menu file.
+
+Package: menu-section
+Architecture: all
+Depends: $\{misc:Depends\}
+Description: {$description} (section)
+ 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
+ things. It should not be installed like a regular package. It may
+ be an empty package.
+ .
+ Test for menu file with weird sections.
diff --git a/t/tests/menu-format-general/debian/debian/menu-broken.menu b/t/tests/menu-format-general/debian/debian/menu-broken.menu
index babd99f..6fcacee 100644
--- a/t/tests/menu-format-general/debian/debian/menu-broken.menu
+++ b/t/tests/menu-format-general/debian/debian/menu-broken.menu
@@ -1,7 +1,7 @@
?package(menu-broken):needs="X11" section="Applications/Programming"\
title="pargs (missing slash)" command="/usr/bin/pargs"\
longtitle="Argument printer (bad-test)"
- icon="none"
+ icon="none" newtag="some value"
?package(menu-broken):needs="X11" section="Applications/Programming"\
title="pargs (dup)" command="/usr/bin/pargs"\
longtitle="Argument printer"\
diff --git a/t/tests/menu-format-general/debian/debian/menu-broken.install b/t/tests/menu-format-general/debian/debian/menu-section.install
similarity index 100%
copy from t/tests/menu-format-general/debian/debian/menu-broken.install
copy to t/tests/menu-format-general/debian/debian/menu-section.install
diff --git a/t/tests/menu-format-general/debian/debian/menu-broken.manpages b/t/tests/menu-format-general/debian/debian/menu-section.manpages
similarity index 100%
copy from t/tests/menu-format-general/debian/debian/menu-broken.manpages
copy to t/tests/menu-format-general/debian/debian/menu-section.manpages
diff --git a/t/tests/menu-format-general/debian/debian/menu-section.menu b/t/tests/menu-format-general/debian/debian/menu-section.menu
new file mode 100644
index 0000000..45d8af8
--- /dev/null
+++ b/t/tests/menu-format-general/debian/debian/menu-section.menu
@@ -0,0 +1,9 @@
+?package(menu-section):needs="X11" section="Root"\
+ title="pargs (new root)" command="/usr/bin/pargs"\
+ longtitle="Argument printer"
+?package(menu-section):needs="X11" section="Apps/Games"\
+ title="pargs (apps/games)" command="/usr/bin/pargs"\
+ longtitle="Argument printer"
+?package(menu-section):needs="X11" section="Apps/Programming"\
+ title="pargs (apps/prog)" command="/usr/bin/pargs"\
+ longtitle="Argument printer"
diff --git a/t/tests/menu-format-general/desc b/t/tests/menu-format-general/desc
index caab68c..eee5e0e 100644
--- a/t/tests/menu-format-general/desc
+++ b/t/tests/menu-format-general/desc
@@ -7,5 +7,9 @@ Test-For:
duplicated-tag-in-menu-item
menu-command-not-in-package
menu-icon-missing
+ menu-item-creates-new-root-section
+ menu-item-creates-new-section
+ menu-item-uses-apps-games-section
+ menu-item-uses-apps-section
menu-item-uses-icon-none
unparsable-menu-item
diff --git a/t/tests/menu-format-general/tags b/t/tests/menu-format-general/tags
index 8cf44bd..cae99e4 100644
--- a/t/tests/menu-format-general/tags
+++ b/t/tests/menu-format-general/tags
@@ -1,8 +1,12 @@
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:9
+E: menu-section: menu-item-creates-new-root-section Root usr/share/menu/menu-section:3
W: menu-broken: duplicated-tag-in-menu-item usr/share/menu/menu-broken longtitle:9
W: menu-cmd: menu-command-not-in-package usr/share/menu/menu-cmd:3 usr/bin/not-here
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
W: menu-none: menu-item-uses-icon-none usr/share/menu/menu-none:4
+W: menu-section: menu-item-creates-new-section Apps/Games usr/share/menu/menu-section:6
+W: menu-section: menu-item-uses-apps-games-section usr/share/menu/menu-section:6
+W: menu-section: menu-item-uses-apps-section usr/share/menu/menu-section:9
--
Debian package checker
Reply to: