X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/70d761713bf1b1b4520079161708f66e8e3a4e31..61db48241f2d46697a291bfedaf398a1ca9a70e3:/test/integration/test-bug-593360-modifiers-in-names?ds=sidebyside diff --git a/test/integration/test-bug-593360-modifiers-in-names b/test/integration/test-bug-593360-modifiers-in-names index 83a3cfabf..dc9a15231 100755 --- a/test/integration/test-bug-593360-modifiers-in-names +++ b/test/integration/test-bug-593360-modifiers-in-names @@ -1,13 +1,13 @@ #!/bin/sh set -e -TESTDIR=$(readlink -f $(dirname $0)) -. $TESTDIR/framework +TESTDIR="$(readlink -f "$(dirname "$0")")" +. "$TESTDIR/framework" setupenvironment configarchitecture "i386" setupaptarchive -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: g++ @@ -15,7 +15,12 @@ The following NEW packages will be installed: Inst g++ (4:4.4.5-1 localhost [i386]) Conf g++ (4:4.4.5-1 localhost [i386])' aptget install g++ -s -testequal 'Reading package lists... +testsuccessequal "Reading package lists... +Building dependency tree... +Package 'g++' is not installed, so not removed +0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove g++ -s + +testsuccessequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: g++ @@ -23,7 +28,7 @@ The following NEW packages will be installed: Inst g++ (4:4.4.5-1 localhost [i386]) Conf g++ (4:4.4.5-1 localhost [i386])' aptget install g+++ -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: g++ @@ -31,7 +36,7 @@ The following NEW packages will be installed: Inst g++ (4:4.4.5-1 localhost [i386]) Conf g++ (4:4.4.5-1 localhost [i386])' aptget purge g+++ -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: apt @@ -39,7 +44,7 @@ The following NEW packages will be installed: Inst apt (0.8.8 localhost [all]) Conf apt (0.8.8 localhost [all])' aptget install apt -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: apt+ @@ -47,7 +52,7 @@ The following NEW packages will be installed: Inst apt+ (0.8.8 localhost [all]) Conf apt+ (0.8.8 localhost [all])' aptget install apt+ -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: apt+ @@ -55,7 +60,7 @@ The following NEW packages will be installed: Inst apt+ (0.8.8 localhost [all]) Conf apt+ (0.8.8 localhost [all])' aptget install apt++ -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: apt+