X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/05f64ca2e483709faa6bc69dfa79129d2d4c679e..dabe9e2482180ada77d2adda2b3c03db22059fb8:/test/integration/test-specific-architecture-dependencies?ds=inline diff --git a/test/integration/test-specific-architecture-dependencies b/test/integration/test-specific-architecture-dependencies index 1c72d7b22..447e407e5 100755 --- a/test/integration/test-specific-architecture-dependencies +++ b/test/integration/test-specific-architecture-dependencies @@ -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' @@ -35,7 +35,7 @@ setupaptarchive testsuccessequal 'Reading package lists... Building dependency tree... -The following extra packages will be installed: +The following additional packages will be installed: libc6:i386 The following NEW packages will be installed: libc6:i386 pre-depender @@ -47,7 +47,7 @@ Conf pre-depender (1 unstable [all])' aptget install pre-depender -s testsuccessequal 'Reading package lists... Building dependency tree... -The following extra packages will be installed: +The following additional packages will be installed: libc6:i386 The following NEW packages will be installed: depender libc6:i386 @@ -59,7 +59,7 @@ Conf depender (1 unstable [all])' aptget install depender -s testsuccessequal 'Reading package lists... Building dependency tree... -The following extra packages will be installed: +The following additional packages will be installed: libc6:i386 The following NEW packages will be installed: depender-x32:i386 libc6:i386 @@ -69,9 +69,9 @@ Inst depender-x32:i386 (1 unstable [i386]) Conf libc6:i386 (1 unstable [i386]) Conf depender-x32:i386 (1 unstable [i386])' aptget install depender-x32:i386 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... -The following extra packages will be installed: +The following additional packages will be installed: libc6:i386 The following NEW packages will be installed: depender-x32 libc6:i386 @@ -81,9 +81,9 @@ Inst depender-x32 (1 unstable [amd64]) Conf libc6:i386 (1 unstable [i386]) Conf depender-x32 (1 unstable [amd64])' aptget install depender-x32:amd64 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... -The following extra packages will be installed: +The following additional packages will be installed: libc6 The following NEW packages will be installed: depender-x64 libc6 @@ -93,9 +93,9 @@ Inst depender-x64 (1 unstable [amd64]) Conf libc6 (1 unstable [amd64]) Conf depender-x64 (1 unstable [amd64])' aptget install depender-x64:amd64 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... -The following extra packages will be installed: +The following additional packages will be installed: libc6 The following NEW packages will be installed: depender-x64:i386 libc6 @@ -105,15 +105,15 @@ Inst depender-x64:i386 (1 unstable [i386]) Conf libc6 (1 unstable [amd64]) Conf depender-x64:i386 (1 unstable [i386])' aptget install depender-x64:i386 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following packages will be REMOVED: - libold libold:i386 + libold:i386 libold The following NEW packages will be installed: breaker 0 upgraded, 1 newly installed, 2 to remove and 0 not upgraded. -Remv libold [1] Remv libold:i386 [1] +Remv libold [1] Inst breaker (1 unstable [all]) Conf breaker (1 unstable [all])' aptget install breaker -s @@ -128,7 +128,7 @@ Remv libold:i386 [1] Inst breaker-x32 (1 unstable [amd64]) Conf breaker-x32 (1 unstable [amd64])' aptget install breaker-x32:amd64 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following packages will be REMOVED: libold:i386 @@ -139,7 +139,7 @@ Remv libold:i386 [1] Inst breaker-x32:i386 (1 unstable [i386]) Conf breaker-x32:i386 (1 unstable [i386])' aptget install breaker-x32:i386 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following packages will be REMOVED: libold @@ -213,7 +213,7 @@ The following NEW packages will be installed: Inst foo-native-depender (1 unstable [amd64]) Conf foo-native-depender (1 unstable [amd64])' aptget install foo-native-depender -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: foo-foreign-depender:i386 @@ -265,9 +265,9 @@ Conf foo-no-conflictor:i386 (1 unstable [i386])' aptget install foo-no-conflicto msgmsg 'switch to single architecture' configarchitecture 'amd64' -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... -The following extra packages will be installed: +The following additional packages will be installed: libc6 The following NEW packages will be installed: depender-x64 libc6 @@ -277,11 +277,11 @@ Inst depender-x64 (1 unstable [amd64]) Conf libc6 (1 unstable [amd64]) Conf depender-x64 (1 unstable [amd64])' aptget install depender-x64 -s -testequal 'Reading package lists... +testfailureequal 'Reading package lists... Building dependency tree... -E: Unable to locate package depender-x64' aptget install depender-x64:i386 -s +E: Unable to locate package depender-x64:i386' aptget install depender-x64:i386 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: foo-native-depender @@ -289,16 +289,18 @@ The following NEW packages will be installed: Inst foo-native-depender (1 unstable [amd64]) Conf foo-native-depender (1 unstable [amd64])' aptget install foo-native-depender -s -# libold:i386 is installed, but we don't see it as i386 isn't configured -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... +The following packages will be REMOVED: + libold:i386 The following NEW packages will be installed: breaker-x32 -0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +0 upgraded, 1 newly installed, 1 to remove and 0 not upgraded. +Remv libold:i386 [1] Inst breaker-x32 (1 unstable [amd64]) Conf breaker-x32 (1 unstable [amd64])' aptget install breaker-x32:amd64 -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following packages will be REMOVED: libold @@ -309,7 +311,7 @@ Remv libold [1] Inst breaker-x64 (1 unstable [amd64]) Conf breaker-x64 (1 unstable [amd64])' aptget install breaker-x64:amd64 -s -testequal 'Reading package lists... +testfailureequal 'Reading package lists... Building dependency tree... Some packages could not be installed. This may mean that you have requested an impossible situation or if you are using the unstable