X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/3e68f7e41022790619c698a32390a5256fadba7c..61db48241f2d46697a291bfedaf398a1ca9a70e3:/test/integration/test-bug-612099-multiarch-conflicts diff --git a/test/integration/test-bug-612099-multiarch-conflicts b/test/integration/test-bug-612099-multiarch-conflicts index c32600037..bc573951d 100755 --- a/test/integration/test-bug-612099-multiarch-conflicts +++ b/test/integration/test-bug-612099-multiarch-conflicts @@ -1,8 +1,8 @@ #!/bin/sh set -e -TESTDIR=$(readlink -f $(dirname $0)) -. $TESTDIR/framework +TESTDIR="$(readlink -f "$(dirname "$0")")" +. "$TESTDIR/framework" setupenvironment configarchitecture 'i386' 'amd64' @@ -17,7 +17,7 @@ setupaptarchive testsuccess aptget install libc6:i386 -t stable -y testdpkginstalled libc6:i386 -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... Reading state information... The following packages will be REMOVED: @@ -29,7 +29,7 @@ Remv libc6 [1.0] Inst libc6:amd64 (1.0 stable [amd64]) Conf libc6:amd64 (1.0 stable [amd64])' aptget install libc6:amd64 -s -t stable -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... Reading state information... The following NEW packages will be installed: @@ -38,10 +38,10 @@ The following NEW packages will be installed: Inst foobar (1.0 stable [i386]) Conf foobar (1.0 stable [i386])' aptget install foobar -st stable -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... Reading state information... -The following extra packages will be installed: +The following additional packages will be installed: libc6:amd64 The following packages will be REMOVED: libc6 @@ -54,9 +54,10 @@ Inst foobar:amd64 (1.0 stable [amd64]) Conf libc6:amd64 (1.0 stable [amd64]) Conf foobar:amd64 (1.0 stable [amd64])' aptget install foobar:amd64 -st stable -testequal 'Reading package lists... +testsuccessequal "Reading package lists... Building dependency tree... Reading state information... +Selected version '1.0' (stable [i386]) for 'foobar' The following NEW packages will be installed: foobar The following packages will be upgraded: @@ -65,9 +66,9 @@ The following packages will be upgraded: Inst libc6 [1.0] (2.0 testing [all]) Inst foobar (1.0 stable [i386]) Conf libc6 (2.0 testing [all]) -Conf foobar (1.0 stable [i386])' aptget install foobar/stable libc6 -st testing +Conf foobar (1.0 stable [i386])" aptget install foobar/stable libc6 -st testing -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... Reading state information... Calculating upgrade... @@ -84,19 +85,21 @@ testsuccess aptget purge libc6 -y testsuccess aptget install libc6:i386 -y testdpkginstalled libc6:all -testequal 'Reading package lists... +testsuccessequal "Reading package lists... Building dependency tree... Reading state information... +Selected version '1.0' (stable [i386]) for 'foobar' The following NEW packages will be installed: foobar 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. Inst foobar (1.0 stable [i386]) -Conf foobar (1.0 stable [i386])' aptget install foobar/stable -st testing +Conf foobar (1.0 stable [i386])" aptget install foobar/stable -st testing -testequal 'Reading package lists... +testsuccessequal "Reading package lists... Building dependency tree... Reading state information... -The following extra packages will be installed: +Selected version '1.0' (stable [amd64]) for 'foobar:amd64' +The following additional packages will be installed: libc6:amd64 The following packages will be REMOVED: libc6 @@ -107,10 +110,10 @@ Remv libc6 [2.0] Inst libc6:amd64 (1.0 stable [amd64]) Inst foobar:amd64 (1.0 stable [amd64]) Conf libc6:amd64 (1.0 stable [amd64]) -Conf foobar:amd64 (1.0 stable [amd64])' aptget install foobar:amd64/stable -st testing +Conf foobar:amd64 (1.0 stable [amd64])" aptget install foobar:amd64/stable -st testing -testequal "Reading package lists... +testsuccessequal "Reading package lists... Building dependency tree... Reading state information... Selected version '1.0' (stable [i386]) for 'libc6' @@ -118,7 +121,7 @@ The following packages will be DOWNGRADED: libc6 0 upgraded, 0 newly installed, 1 downgraded, 0 to remove and 0 not upgraded. Inst libc6 [2.0] (1.0 stable [i386]) -Conf libc6 (1.0 stable [i386])" aptget install libc6/stable -s -q=0 +Conf libc6 (1.0 stable [i386])" aptget install libc6/stable -s buildsimplenativepackage 'libc6-same' 'i386' '1.0' 'stable' 'Multi-Arch: same' @@ -133,7 +136,7 @@ setupaptarchive testsuccess aptget install libc6-same:i386 -t stable -y testdpkginstalled libc6-same:i386 -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... Reading state information... The following NEW packages will be installed: @@ -142,10 +145,10 @@ The following NEW packages will be installed: Inst foobar-same (1.0 stable [i386]) Conf foobar-same (1.0 stable [i386])' aptget install foobar-same -st stable -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... Reading state information... -The following extra packages will be installed: +The following additional packages will be installed: libc6-same:amd64 The following NEW packages will be installed: foobar-same:amd64 libc6-same:amd64 @@ -155,7 +158,7 @@ Inst foobar-same:amd64 (1.0 stable [amd64]) Conf libc6-same:amd64 (1.0 stable [amd64]) Conf foobar-same:amd64 (1.0 stable [amd64])' aptget install foobar-same:amd64 -st stable -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... Reading state information... The following NEW packages will be installed: @@ -166,7 +169,7 @@ Conf libc6-same:amd64 (1.0 stable [amd64])' aptget install libc6-same:amd64 -s - # FIXME: We should test installing libc6-same:amd64 here, but dpkg doesn't allow it currently -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... Reading state information... Calculating upgrade... @@ -184,7 +187,7 @@ testsuccess aptget install libc6-same:i386 -y testdpkginstalled libc6-same:all -testequal "Reading package lists... +testsuccessequal "Reading package lists... Building dependency tree... Reading state information... Selected version '1.0' (stable [i386]) for 'libc6-same' @@ -192,21 +195,23 @@ The following packages will be DOWNGRADED: libc6-same 0 upgraded, 0 newly installed, 1 downgraded, 0 to remove and 0 not upgraded. Inst libc6-same [2.0] (1.0 stable [i386]) -Conf libc6-same (1.0 stable [i386])" aptget install libc6-same/stable -s -q=0 +Conf libc6-same (1.0 stable [i386])" aptget install libc6-same/stable -s -testequal 'Reading package lists... +testsuccessequal "Reading package lists... Building dependency tree... Reading state information... +Selected version '1.0' (stable [i386]) for 'foobar-same' The following NEW packages will be installed: foobar-same 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. Inst foobar-same (1.0 stable [i386]) -Conf foobar-same (1.0 stable [i386])' aptget install foobar-same/stable -st testing +Conf foobar-same (1.0 stable [i386])" aptget install foobar-same/stable -st testing -testequal 'Reading package lists... +testsuccessequal "Reading package lists... Building dependency tree... Reading state information... -The following extra packages will be installed: +Selected version '1.0' (stable [amd64]) for 'foobar-same:amd64' +The following additional packages will be installed: libc6-same:amd64 The following packages will be REMOVED: libc6-same @@ -217,4 +222,4 @@ Remv libc6-same [2.0] Inst libc6-same:amd64 (1.0 stable [amd64]) Inst foobar-same:amd64 (1.0 stable [amd64]) Conf libc6-same:amd64 (1.0 stable [amd64]) -Conf foobar-same:amd64 (1.0 stable [amd64])' aptget install foobar-same:amd64/stable -st testing +Conf foobar-same:amd64 (1.0 stable [amd64])" aptget install foobar-same:amd64/stable -st testing