test-apt-cdrom: Fix for gnupg 2.1.15

[apt.git] / test / integration / test-no-fds-leaked-to-maintainer-scripts

diff --git a/test/integration/test-no-fds-leaked-to-maintainer-scripts b/test/integration/test-no-fds-leaked-to-maintainer-scripts
index 21b394055b442cbf8552a1e897df06ed6eec4b9e..7b5d6727ef0781ed7f1279bd678364aae46f7b9d 100755 (executable)
--- a/test/integration/test-no-fds-leaked-to-maintainer-scripts
+++ b/test/integration/test-no-fds-leaked-to-maintainer-scripts
@@ -8,6 +8,11 @@ setupenvironment
 configarchitecture 'amd64' 'i386'
 configdpkgnoopchroot
 
 configarchitecture 'amd64' 'i386'
 configdpkgnoopchroot
 

+if [ ! -e /proc/self/fd ]; then
+       msgskip "needs /proc/self/fd"
+    exit 0
+fi
+

 setupsimplenativepackage "fdleaks" 'all' '1.0' 'unstable'
 BUILDDIR="incoming/fdleaks-1.0"
 for script in 'preinst' 'postinst' 'prerm' 'postrm'; do
 setupsimplenativepackage "fdleaks" 'all' '1.0' 'unstable'
 BUILDDIR="incoming/fdleaks-1.0"
 for script in 'preinst' 'postinst' 'prerm' 'postrm'; do


@@ -24,7 +29,7 @@ buildpackage "$BUILDDIR" 'unstable' 'main' 'native'
 rm -rf "$BUILDDIR"
 
 PKGNAME='fdleaks:all'
 rm -rf "$BUILDDIR"
 
 PKGNAME='fdleaks:all'

-if ! dpkg-checkbuilddeps -d 'dpkg (>= 1.16.2)' /dev/null >/dev/null 2>&1; then
+if dpkg --compare-versions "$(dpkg_version)" 'lt' '1.16.2'; then

        PKGNAME='fdleaks'
 fi
 
        PKGNAME='fdleaks'
 fi
 


@@ -79,6 +84,7 @@ status half-configured $PKGNAME 1.0
 status half-installed $PKGNAME 1.0
 status config-files $PKGNAME 1.0
 status config-files $PKGNAME 1.0
 status half-installed $PKGNAME 1.0
 status config-files $PKGNAME 1.0
 status config-files $PKGNAME 1.0

+startup packages configure

 startup packages purge
 remove $PKGNAME 1.0 <none>
 purge $PKGNAME 1.0 <none>
 startup packages purge
 remove $PKGNAME 1.0 <none>
 purge $PKGNAME 1.0 <none>