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

[SCM] Debian package checker branch, master, updated. 2.2.14-30-g19af980



The following commit has been merged in the master branch:
commit 0b3c088b02c6801af527f9129381b73bba5446bd
Author: Russ Allbery <rra@debian.org>
Date:   Sun Sep 13 11:59:23 2009 -0700

    Add test cases for more script interpreter tags

diff --git a/t/COVERAGE b/t/COVERAGE
index 55ca350..e1f15e1 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -186,18 +186,21 @@ rules debian-rules-uses-DEB_BUILD_OPTS
 rules missing-build-dependency
 
 scripts csh-considered-harmful
+scripts example-interpreter-in-usr-local
+scripts example-interpreter-not-absolute
+scripts example-script-uses-bin-env
+scripts example-script-without-interpreter
+scripts example-shell-script-fails-syntax-check
+scripts example-unusual-interpreter
+scripts example-wrong-path-for-interpreter
 scripts gawk-script-but-no-gawk-dep
-scripts interpreter-in-usr-local
-scripts interpreter-not-absolute
 scripts killall-is-dangerous
 scripts maintainer-script-needs-depends-on-adduser
 scripts maintainer-script-needs-depends-on-update-inetd
 scripts mawk-script-but-no-mawk-dep
 scripts mknod-in-maintainer-script
 scripts ruby-script-but-no-ruby-dep
-scripts script-without-interpreter
 scripts tclsh-script-but-no-tclsh-dep
-scripts unusual-interpreter
 scripts wish-script-but-no-wish-dep
 
 shared-libs dev-pkg-without-shlib-symlink
@@ -515,7 +518,6 @@ scripts maintainer-shell-script-fails-syntax-check
 scripts php-script-but-no-phpX-cli-dep
 scripts python-script-but-no-python-dep
 scripts script-not-executable
-scripts script-uses-bin-env
 scripts shell-script-fails-syntax-check
 scripts suid-perl-script-but-no-perl-suid-dep
 scripts update-alternatives-remove-called-in-postrm
@@ -884,7 +886,6 @@ scripts
   php-script-but-no-phpX-cli-dep
   python-script-but-no-python-dep
   script-in-usr-share-doc
-  script-uses-bin-env
   script-with-language-extension
   setuid-binary
   shell-script-fails-syntax-check
diff --git a/t/tests/scripts-interpreters/debian/README b/t/tests/scripts-interpreters/debian/README
deleted file mode 100644
index e845566..0000000
--- a/t/tests/scripts-interpreters/debian/README
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/t/tests/scripts-interpreters/debian/bin-env b/t/tests/scripts-interpreters/debian/bin-env
new file mode 100644
index 0000000..005e1a9
--- /dev/null
+++ b/t/tests/scripts-interpreters/debian/bin-env
@@ -0,0 +1,2 @@
+#!/bin/env perl
+print "Hello world\n";
diff --git a/t/tests/scripts-interpreters/debian/debian/install b/t/tests/scripts-interpreters/debian/debian/install
index c86edc9..aadd18a 100644
--- a/t/tests/scripts-interpreters/debian/debian/install
+++ b/t/tests/scripts-interpreters/debian/debian/install
@@ -1,2 +1,9 @@
-unversioned-pike	usr/bin/
-versioned-pike		usr/bin/
+bin-env                 usr/bin/
+no-interpreter          usr/bin/
+not-absolute            usr/bin/
+syntax                  usr/bin/
+unusual                 usr/bin/
+unversioned-pike        usr/bin/
+usr-local               usr/bin/
+versioned-pike          usr/bin/
+wrong-perl-path         usr/bin/
diff --git a/t/tests/scripts-interpreters/debian/debian/links b/t/tests/scripts-interpreters/debian/debian/links
index c02a1ea..353369f 100644
--- a/t/tests/scripts-interpreters/debian/debian/links
+++ b/t/tests/scripts-interpreters/debian/debian/links
@@ -1,2 +1,9 @@
-usr/share/man/man1/interpreters.1	usr/share/man/man1/unversioned-pike.1
-usr/share/man/man1/interpreters.1	usr/share/man/man1/versioned-pike.1
+usr/share/man/man1/interpreters.1       usr/share/man/man1/bin-env.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/syntax.1
+usr/share/man/man1/interpreters.1       usr/share/man/man1/unusual.1
+usr/share/man/man1/interpreters.1       usr/share/man/man1/unversioned-pike.1
+usr/share/man/man1/interpreters.1       usr/share/man/man1/usr-local.1
+usr/share/man/man1/interpreters.1       usr/share/man/man1/versioned-pike.1
+usr/share/man/man1/interpreters.1       usr/share/man/man1/wrong-perl-path.1
diff --git a/t/tests/scripts-interpreters/debian/no-interpreter b/t/tests/scripts-interpreters/debian/no-interpreter
new file mode 100644
index 0000000..3487806
--- /dev/null
+++ b/t/tests/scripts-interpreters/debian/no-interpreter
@@ -0,0 +1,3 @@
+#!
+# Script missing any interpreter.
+true
diff --git a/t/tests/scripts-interpreters/debian/not-absolute b/t/tests/scripts-interpreters/debian/not-absolute
new file mode 100644
index 0000000..ee656c6
--- /dev/null
+++ b/t/tests/scripts-interpreters/debian/not-absolute
@@ -0,0 +1,2 @@
+#!perl
+print "Hello world\n";
diff --git a/t/tests/scripts-interpreters/debian/syntax b/t/tests/scripts-interpreters/debian/syntax
new file mode 100644
index 0000000..c04b97f
--- /dev/null
+++ b/t/tests/scripts-interpreters/debian/syntax
@@ -0,0 +1,4 @@
+#!/bin/sh
+# A shell script with a syntax error.
+if true ; then
+    echo True
diff --git a/t/tests/scripts-interpreters/debian/unusual b/t/tests/scripts-interpreters/debian/unusual
new file mode 100644
index 0000000..8a74f66
--- /dev/null
+++ b/t/tests/scripts-interpreters/debian/unusual
@@ -0,0 +1,2 @@
+#!/usr/bin/lintian
+use lintian shell to check package
diff --git a/t/tests/scripts-interpreters/debian/usr-local b/t/tests/scripts-interpreters/debian/usr-local
new file mode 100644
index 0000000..be79cf8
--- /dev/null
+++ b/t/tests/scripts-interpreters/debian/usr-local
@@ -0,0 +1,2 @@
+#!/usr/local/bin/special-perl
+print "Hello world\n";
diff --git a/t/tests/scripts-interpreters/debian/wrong-perl-path b/t/tests/scripts-interpreters/debian/wrong-perl-path
new file mode 100644
index 0000000..1602d4e
--- /dev/null
+++ b/t/tests/scripts-interpreters/debian/wrong-perl-path
@@ -0,0 +1,2 @@
+#!/bin/perl
+print "Hello world\n";
diff --git a/t/tests/scripts-interpreters/desc b/t/tests/scripts-interpreters/desc
index 7c920b7..1d695a7 100644
--- a/t/tests/scripts-interpreters/desc
+++ b/t/tests/scripts-interpreters/desc
@@ -1,5 +1,12 @@
 Testname: scripts-interpreters
 Sequence: 6000
 Version: 1.0
-Description: Ensure package dependencies provide interpreters used by scripts
-Test-For: missing-dep-for-interpreter
+Description: Check various script interpreter issues
+Test-For:
+ interpreter-in-usr-local
+ interpreter-not-absolute
+ missing-dep-for-interpreter
+ script-uses-bin-env
+ script-without-interpreter
+ unusual-interpreter
+ wrong-path-for-interpreter
diff --git a/t/tests/scripts-interpreters/tags b/t/tests/scripts-interpreters/tags
index 03c091b..c70697d 100644
--- a/t/tests/scripts-interpreters/tags
+++ b/t/tests/scripts-interpreters/tags
@@ -1,2 +1,10 @@
+E: scripts-interpreters: interpreter-in-usr-local ./usr/bin/usr-local #!/usr/local/bin/special-perl
 E: scripts-interpreters: missing-dep-for-interpreter pike => pike7.6 | pike7.6-core (./usr/bin/unversioned-pike)
 E: scripts-interpreters: missing-dep-for-interpreter pike7.6 => pike7.6 | pike7.6-core (./usr/bin/versioned-pike)
+E: scripts-interpreters: script-without-interpreter ./usr/bin/no-interpreter
+E: scripts-interpreters: shell-script-fails-syntax-check ./usr/bin/syntax
+E: scripts-interpreters: wrong-path-for-interpreter ./usr/bin/not-absolute (#!perl != /usr/bin/perl)
+E: scripts-interpreters: wrong-path-for-interpreter ./usr/bin/wrong-perl-path (#!/bin/perl != /usr/bin/perl)
+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

-- 
Debian package checker


Reply to: