eipp: add Allow-Temporary-Remove-of-Essentials

[apt.git] / test / integration / test-bug-590041-prefer-non-virtual-packages

diff --git a/test/integration/test-bug-590041-prefer-non-virtual-packages b/test/integration/test-bug-590041-prefer-non-virtual-packages
index 0ce4c14131c6f0c67e28fbcf8ea994707aed1212..1b1e3aa4f283bce2c2e2ff64986f7e2831f27c27 100755 (executable)
--- a/test/integration/test-bug-590041-prefer-non-virtual-packages
+++ b/test/integration/test-bug-590041-prefer-non-virtual-packages
@@ -1,7 +1,8 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-. $(readlink -f $(dirname $0))/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 setupenvironment
 configarchitecture 'i386' 'armel'
 
 setupenvironment
 configarchitecture 'i386' 'armel'
 


@@ -38,16 +39,16 @@ Section: oldlibs
 Size: 44168
 "
 
 Size: 44168
 "
 

-cat <<-EOF >aptarchive/Packages
+cat >aptarchive/Packages <<EOF

 $pkglibc6
 $pkglibdb1
 EOF
 
 setupaptarchive
 
 $pkglibc6
 $pkglibdb1
 EOF
 
 setupaptarchive
 

-testshowvirtual libc6:i386
-testequal "$pkglibc6" aptcache show libc6:armel
-testequal "$pkglibc6" aptcache show libc6
-testequal "$pkglibdb1" aptcache show libdb1:i386
+testnopackage libc6:i386
+testsuccessequal "$pkglibc6" aptcache show libc6:armel
+testsuccessequal "$pkglibc6" aptcache show libc6
+testsuccessequal "$pkglibdb1" aptcache show libdb1:i386

 testnopackage libdb1:armel
 testnopackage libdb1:armel

-testequal "$pkglibdb1" aptcache show libdb1
+testsuccessequal "$pkglibdb1" aptcache show libdb1