Make directory paths configurable

[apt.git] / test / integration / test-ubuntu-bug-835625-multiarch-lockstep-installed-first

diff --git a/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first b/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first
index a9a4069cf726c47771ebf390d038b08eecf5406d..5a3e2762e47a30bec1d802a74d5bfaedb3a7e2b0 100755 (executable)
--- a/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first
+++ b/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 setupenvironment
 configarchitecture 'amd64' 'i386'
 
 setupenvironment
 configarchitecture 'amd64' 'i386'
 


@@ -14,9 +14,9 @@ insertpackage 'unstable' 'apt' 'i386' '2' 'Depends: libsame (= 2)'
 
 setupaptarchive
 
 
 setupaptarchive
 

-testequal 'Reading package lists...
+testequalor2 'Reading package lists...

 Building dependency tree...
 Building dependency tree...

-The following extra packages will be installed:
+The following additional packages will be installed:

   apt:i386 libsame:i386
 The following NEW packages will be installed:
   libsame
   apt:i386 libsame:i386
 The following NEW packages will be installed:
   libsame


@@ -28,4 +28,18 @@ Inst libsame (2 unstable [amd64]) [apt:i386 ]
 Conf libsame:i386 (2 unstable [i386]) [apt:i386 ]
 Conf libsame (2 unstable [amd64]) [apt:i386 ]
 Inst apt:i386 [1] (2 unstable [i386])
 Conf libsame:i386 (2 unstable [i386]) [apt:i386 ]
 Conf libsame (2 unstable [amd64]) [apt:i386 ]
 Inst apt:i386 [1] (2 unstable [i386])

+Conf apt:i386 (2 unstable [i386])' 'Reading package lists...
+Building dependency tree...
+The following additional packages will be installed:
+  apt:i386 libsame:i386
+The following NEW packages will be installed:
+  libsame
+The following packages will be upgraded:
+  apt:i386 libsame:i386
+2 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst apt:i386 [1] (2 unstable [i386]) []
+Inst libsame:i386 [1] (2 unstable [i386])
+Inst libsame (2 unstable [amd64])
+Conf libsame:i386 (2 unstable [i386])
+Conf libsame (2 unstable [amd64])

 Conf apt:i386 (2 unstable [i386])' aptget install libsame:amd64 -s
 Conf apt:i386 (2 unstable [i386])' aptget install libsame:amd64 -s