X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/3addaba1ff6fe27cc96af5c2d345ee039c2bffec..2a440328ea19e9646a93f847dd9eff21e03ad16d:/test/integration/test-multiarch-foreign?ds=sidebyside

diff --git a/test/integration/test-multiarch-foreign b/test/integration/test-multiarch-foreign
index 8c09a7fde..713b27bd4 100755
--- a/test/integration/test-multiarch-foreign
+++ b/test/integration/test-multiarch-foreign
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture 'amd64' 'i386' 'armel'
 
@@ -98,7 +98,7 @@ The following NEW packages will be installed:
 Inst bar:i386 (1.0 unstable [i386])
 Inst cool-bar (1.0 unstable [amd64])
 Conf bar:i386 (1.0 unstable [i386])
-Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider:i386 -s -q=0
+Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider:i386 -s
 
 satisfiable_in_singlearch() {
 	testsuccessequal 'Reading package lists...
@@ -154,7 +154,7 @@ The following NEW packages will be installed:
 Inst bar (1.0 unstable [amd64])
 Inst cool-bar (1.0 unstable [amd64])
 Conf bar (1.0 unstable [amd64])
-Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider -s -q=0
+Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider -s
 
 	testsuccessequal 'Reading package lists...
 Building dependency tree...
@@ -223,7 +223,7 @@ The following NEW packages will be installed:
 Inst bar:i386 (1.0 unstable [i386])
 Inst cool-bar-x32 (1.0 unstable [amd64])
 Conf bar:i386 (1.0 unstable [i386])
-Conf cool-bar-x32 (1.0 unstable [amd64])' aptget install cool-bar-x32 -s -q=0
+Conf cool-bar-x32 (1.0 unstable [amd64])' aptget install cool-bar-x32 -s
 
 	testsuccessequal 'Reading package lists...
 Building dependency tree...
@@ -235,7 +235,7 @@ The following NEW packages will be installed:
 Inst bar (1.0 unstable [amd64])
 Inst cool-bar-x64 (1.0 unstable [amd64])
 Conf bar (1.0 unstable [amd64])
-Conf cool-bar-x64 (1.0 unstable [amd64])' aptget install cool-bar-x64 -s -q=0
+Conf cool-bar-x64 (1.0 unstable [amd64])' aptget install cool-bar-x64 -s
 
 
 satisfiable_in_singlearch
@@ -250,7 +250,9 @@ msgmsg 'switch to multi-arch with barbarian architecture'
 insertinstalledpackage 'foo' 'armhf' '1.0' 'Multi-Arch: foreign'
 insertinstalledpackage 'bar' 'armhf' '1.0' 'Provides: bar-provider
 Multi-Arch: foreign'
+insertinstalledpackage 'bar-needer' 'armhf' '1.0' 'Depends: bar-provider'
 
+testsuccess aptget check
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 The following additional packages will be installed:
@@ -274,8 +276,12 @@ The following packages will be REMOVED:
 The following NEW packages will be installed:
   bar cool-bar
 0 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
-Remv bar:armhf [1.0]
+Remv bar:armhf [1.0] [bar-needer:armhf ]
 Inst bar (1.0 unstable [amd64])
 Inst cool-bar (1.0 unstable [amd64])
 Conf bar (1.0 unstable [amd64])
 Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar -s
+
+# a barbarian doesn't satisfy another either
+insertinstalledpackage 'bar-needer2' 's390x' '1.0' 'Depends: bar-provider'
+testfailure aptget check