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

[SCM] Debian package checker branch, master, updated. 2.4.3-105-g943b026



The following commit has been merged in the master branch:
commit 943b0269faa4eb1498a1ba734c5047e396476523
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jan 2 18:30:33 2011 +0100

    Added test for useless ldconfig in scripts.

diff --git a/t/COVERAGE b/t/COVERAGE
index 932685a..20cd2c9 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -162,7 +162,6 @@ shared-libs ldconfig-symlink-is-not-a-symlink
 shared-libs ldconfig-symlink-referencing-wrong-file
 shared-libs non-dev-pkg-with-shlib-symlink
 shared-libs pkg-has-shlibs-control-file-but-no-actual-shared-libs
-shared-libs postinst-has-useless-call-to-ldconfig
 shared-libs shlib-calls-exit
 shared-libs shlib-with-bad-permissions
 shared-libs shlib-with-executable-stack
@@ -352,7 +351,6 @@ scripts update-alternatives-remove-called-in-postrm
 shared-libs duplicate-entry-in-symbols-control-file
 shared-libs invalid-template-id-in-symbols-file
 shared-libs ldconfig-symlink-missing-for-shlib
-shared-libs postrm-has-useless-call-to-ldconfig
 shared-libs sharedobject-in-library-directory-missing-soname
 shared-libs shlib-with-executable-bit
 shared-libs symbols-declared-but-not-shlib
@@ -528,7 +526,6 @@ maintainer-scripts
   postinst-does-not-load-confmodule
   postrm-contains-additional-updaterc.d-calls
   postrm-does-not-call-updaterc.d-for-init.d-script
-  postrm-has-useless-call-to-ldconfig
   preinst-calls-updaterc.d
   prerm-calls-updaterc.d
   qa-upload-has-incorrect-version-number
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/app b/t/tests/shared-libs-ldconfig-scripts/debian/app
new file mode 100755
index 0000000..04f1961
--- /dev/null
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/app
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo Hello World
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/app.examples b/t/tests/shared-libs-ldconfig-scripts/debian/debian/app.examples
new file mode 100644
index 0000000..b80f0bd
--- /dev/null
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/app.examples
@@ -0,0 +1 @@
+app
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfish1.preinst b/t/tests/shared-libs-ldconfig-scripts/debian/debian/app.postinst
similarity index 100%
copy from t/tests/shared-libs-ldconfig-scripts/debian/debian/libfish1.preinst
copy to t/tests/shared-libs-ldconfig-scripts/debian/debian/app.postinst
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/app.postrm b/t/tests/shared-libs-ldconfig-scripts/debian/debian/app.postrm
new file mode 100755
index 0000000..46416be
--- /dev/null
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/app.postrm
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = remove ] ; then ldconfig ; if
+
+#DEBHELPER#
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in b/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in
index d89f1b3..ab166c4 100644
--- a/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in
@@ -34,3 +34,13 @@ Description: {$description} (unsafe ldc)
  things.  It should not be installed like a regular package.
  .
  Checks for unsafe ldconfig usage scripts.
+
+Package: app
+Architecture: any
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: {$description} (useless ldc)
+ 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.
+ .
+ Checks for useless ldconfig usage in scripts.
diff --git a/t/tests/shared-libs-ldconfig-scripts/desc b/t/tests/shared-libs-ldconfig-scripts/desc
index 3b27128..93a003b 100644
--- a/t/tests/shared-libs-ldconfig-scripts/desc
+++ b/t/tests/shared-libs-ldconfig-scripts/desc
@@ -3,7 +3,9 @@ Sequence: 6000
 Version: 1.0
 Description: Test checks related to ldconfig in scripts
 Test-For: 
+ postinst-has-useless-call-to-ldconfig
  postinst-must-call-ldconfig
+ postrm-has-useless-call-to-ldconfig
  postrm-should-call-ldconfig
  postrm-unsafe-ldconfig
  preinst-calls-ldconfig
diff --git a/t/tests/shared-libs-ldconfig-scripts/tags b/t/tests/shared-libs-ldconfig-scripts/tags
index d290db5..4769377 100644
--- a/t/tests/shared-libs-ldconfig-scripts/tags
+++ b/t/tests/shared-libs-ldconfig-scripts/tags
@@ -1,5 +1,7 @@
 E: libfoo1: postinst-must-call-ldconfig usr/lib/libfoo.so.1.0.1
 E: libfoo1: postrm-should-call-ldconfig usr/lib/libfoo.so.1.0.1
+W: app: postinst-has-useless-call-to-ldconfig
+W: app: postrm-has-useless-call-to-ldconfig
 W: libfish1: preinst-calls-ldconfig
 W: libfish1: prerm-calls-ldconfig
 W: libuns1: postrm-unsafe-ldconfig

-- 
Debian package checker


Reply to: