X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/3addaba1ff6fe27cc96af5c2d345ee039c2bffec..a9c2517e9ce961a761022dfa8eb0b62f68f5df9e:/test/integration/test-apt-get-install-virtual-pkgs diff --git a/test/integration/test-apt-get-install-virtual-pkgs b/test/integration/test-apt-get-install-virtual-pkgs index ca3790f46..b2fd7499c 100755 --- a/test/integration/test-apt-get-install-virtual-pkgs +++ b/test/integration/test-apt-get-install-virtual-pkgs @@ -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' @@ -32,7 +32,7 @@ The following NEW packages will be installed: foo 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. Inst foo (1 unstable [amd64]) -Conf foo (1 unstable [amd64])" aptget install foo-prv -s -q=0 +Conf foo (1 unstable [amd64])" aptget install foo-prv -s testvirtuals() { testfailureequal "Reading package lists... @@ -42,7 +42,7 @@ Package $1 is a virtual package provided by: $2 You should explicitly select one to install. -E: Package '$1' has no installation candidate" aptget install $1 -s -q=0 +E: Package '$1' has no installation candidate" aptget install $1 -s } testvirtuals 'foo-prv1' 'baz1 1' 'foo1 1' @@ -61,4 +61,4 @@ Package foo-prv5 is a virtual package provided by: foo5:i386 2 [Not candidate version] baz5 1 [Not candidate version] -E: Package 'foo-prv5' has no installation candidate" aptget install foo-prv5 -s -q=0 +E: Package 'foo-prv5' has no installation candidate" aptget install foo-prv5 -s