X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/25b86db159fbc3c043628e285c0c1ef24dec2c6e..2906182db398419a9c59a928b7ae73cf7c7aa307:/test/integration/test-conflicts-real-multiarch-same diff --git a/test/integration/test-conflicts-real-multiarch-same b/test/integration/test-conflicts-real-multiarch-same index e6c6c0e01..73f7b9a61 100755 --- a/test/integration/test-conflicts-real-multiarch-same +++ b/test/integration/test-conflicts-real-multiarch-same @@ -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' @@ -26,7 +26,7 @@ The following NEW packages will be installed: Inst virtual-provider (2 unstable [amd64]) Inst virtual-provider:i386 (2 unstable [i386]) Conf virtual-provider (2 unstable [amd64]) -Conf virtual-provider:i386 (2 unstable [i386])" aptget install virtual:* -s -q=0 +Conf virtual-provider:i386 (2 unstable [i386])" aptget install virtual:* -s testsuccessequal 'Reading package lists... Building dependency tree... @@ -36,7 +36,7 @@ The following NEW packages will be installed: Inst real (2 unstable [amd64]) Inst real:i386 (2 unstable [i386]) Conf real (2 unstable [amd64]) -Conf real:i386 (2 unstable [i386])' aptget install real:* -s -q=0 +Conf real:i386 (2 unstable [i386])' aptget install real:* -s # ensure that we are not confused by the provides testsuccessequal 'Reading package lists... @@ -47,4 +47,4 @@ The following NEW packages will be installed: Inst real-provider (2 unstable [amd64]) Inst real-provider:i386 (2 unstable [i386]) Conf real-provider (2 unstable [amd64]) -Conf real-provider:i386 (2 unstable [i386])' aptget install real-provider:* -s -q=0 +Conf real-provider:i386 (2 unstable [i386])' aptget install real-provider:* -s