[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.0-rc1-25-gfcae60f



The following commit has been merged in the master branch:
commit fcae60f3f43635b7d7ba01afcc6c9c7a1c5d1a10
Author: Niels Thykier <niels@thykier.net>
Date:   Fri Mar 25 22:28:07 2011 +0100

    Improved menu-format test coverage

diff --git a/t/COVERAGE b/t/COVERAGE
index 9615308..8dad03f 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -112,8 +112,6 @@ manpages manpage-for-non-x11-binary-in-wrong-directory
 manpages manpage-for-x11-binary-in-wrong-directory
 manpages manpage-in-wrong-directory
 
-menu-format bad-test-in-menu-item
-menu-format duplicated-tag-in-menu-item
 menu-format menu-icon-cannot-be-parsed
 menu-format menu-icon-not-in-xpm-format
 menu-format menu-icon-too-big
@@ -123,7 +121,6 @@ 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 unparsable-menu-item
 menu-format whitespace-after-continuation-character
 
 menus doc-base-abstract-field-is-template
@@ -284,7 +281,6 @@ 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-command-not-in-package
 menu-format menu-item-creates-new-section
 menu-format menu-item-missing-required-tag
 menu-format menu-item-needs-tag-has-unknown-value
@@ -383,7 +379,6 @@ binary
   executable-not-elf-or-script
   file-name-ends-in-whitespace
   lengthy-symlink
-  menu-command-not-in-package
   menu-file-in-usr-lib
   menu-item-creates-new-section
   menu-item-missing-required-tag
diff --git a/t/tests/menu-format-general/debian/debian/control.in b/t/tests/menu-format-general/debian/debian/control.in
index 66a055d..430d56a 100644
--- a/t/tests/menu-format-general/debian/debian/control.in
+++ b/t/tests/menu-format-general/debian/debian/control.in
@@ -27,3 +27,13 @@ Description: {$description} (cmd)
  .
  Test for command not being in the package.
 
+Package: menu-broken
+Architecture: all
+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
+ things.  It should not be installed like a regular package.  It may
+ be an empty package.
+ .
+ Test for broken menu file.
diff --git a/t/tests/menu-format-general/debian/debian/menu-none.install b/t/tests/menu-format-general/debian/debian/menu-broken.install
similarity index 100%
copy from t/tests/menu-format-general/debian/debian/menu-none.install
copy to t/tests/menu-format-general/debian/debian/menu-broken.install
diff --git a/t/tests/menu-format-general/debian/debian/menu-none.manpages b/t/tests/menu-format-general/debian/debian/menu-broken.manpages
similarity index 100%
copy from t/tests/menu-format-general/debian/debian/menu-none.manpages
copy to t/tests/menu-format-general/debian/debian/menu-broken.manpages
diff --git a/t/tests/menu-format-general/debian/debian/menu-broken.menu b/t/tests/menu-format-general/debian/debian/menu-broken.menu
new file mode 100644
index 0000000..babd99f
--- /dev/null
+++ b/t/tests/menu-format-general/debian/debian/menu-broken.menu
@@ -0,0 +1,9 @@
+?package(menu-broken):needs="X11" section="Applications/Programming"\
+  title="pargs (missing slash)" command="/usr/bin/pargs"\
+  longtitle="Argument printer (bad-test)"
+  icon="none"
+?package(menu-broken):needs="X11" section="Applications/Programming"\
+  title="pargs (dup)" command="/usr/bin/pargs"\
+  longtitle="Argument printer"\
+  longtitle="Argument printer"\
+  unparseable-stuff
diff --git a/t/tests/menu-format-general/desc b/t/tests/menu-format-general/desc
index 5b1ea5b..caab68c 100644
--- a/t/tests/menu-format-general/desc
+++ b/t/tests/menu-format-general/desc
@@ -3,6 +3,9 @@ Sequence: 6000
 Version: 1.0
 Description: Test menu file tags
 Test-For:
+ bad-test-in-menu-item
+ duplicated-tag-in-menu-item
  menu-command-not-in-package
  menu-icon-missing
  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 e751298..8cf44bd 100644
--- a/t/tests/menu-format-general/tags
+++ b/t/tests/menu-format-general/tags
@@ -1,3 +1,6 @@
+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
+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

-- 
Debian package checker


Reply to: