X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/e3c62328abbd548bb0da42fdbad954b3ce4f7102..61db48241f2d46697a291bfedaf398a1ca9a70e3:/test/integration/test-bug-590041-prefer-non-virtual-packages?ds=inline

diff --git a/test/integration/test-bug-590041-prefer-non-virtual-packages b/test/integration/test-bug-590041-prefer-non-virtual-packages
index 0ce4c1413..1b1e3aa4f 100755
--- 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
 
-. $(readlink -f $(dirname $0))/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture 'i386' 'armel'
 
@@ -38,16 +39,16 @@ Section: oldlibs
 Size: 44168
 "
 
-cat <<-EOF >aptarchive/Packages
+cat >aptarchive/Packages <<EOF
 $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
-testequal "$pkglibdb1" aptcache show libdb1
+testsuccessequal "$pkglibdb1" aptcache show libdb1