tests: activate dpkg multi-arch even if test is single arch

[apt.git] / test / integration / test-unpack-different-version-unpacked

diff --git a/test/integration/test-unpack-different-version-unpacked b/test/integration/test-unpack-different-version-unpacked
index ae121cf4ee246c2d07d1bf48e000703ca1af45a4..bcb483639ee685b3adaea8634d2de59fc6276582 100755 (executable)
--- a/test/integration/test-unpack-different-version-unpacked
+++ b/test/integration/test-unpack-different-version-unpacked
@@ -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'
 


@@ -32,7 +32,7 @@ insertinstalledpackage 'libqtcore4' 'i386' '1' 'Multi-Arch: same' '' 'install ok
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done

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

   libqtcore4:i386
 The following packages will be upgraded:
   libqtcore4:i386
   libqtcore4:i386
 The following packages will be upgraded:
   libqtcore4:i386


@@ -48,7 +48,7 @@ insertinstalledpackage 'libqtcore4' 'amd64' '1' 'Multi-Arch: same' '' 'install o
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done

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

   libqtcore4
 The following packages will be upgraded:
   libqtcore4
   libqtcore4
 The following packages will be upgraded:
   libqtcore4


@@ -64,7 +64,7 @@ insertinstalledpackage 'libqtcore4' 'i386' '1' 'Multi-Arch: same'
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done

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

   libqtcore4:i386
 The following packages will be upgraded:
   libqtcore4:i386
   libqtcore4:i386
 The following packages will be upgraded:
   libqtcore4:i386


@@ -80,7 +80,7 @@ insertinstalledpackage 'libqtcore4' 'amd64' '1' 'Multi-Arch: same'
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done

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

   libqtcore4
 The following packages will be upgraded:
   libqtcore4
   libqtcore4
 The following packages will be upgraded:
   libqtcore4


@@ -96,7 +96,7 @@ insertinstalledpackage 'libqtcore4' 'i386' '1' 'Multi-Arch: same' '' 'install ok
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done

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

   libqtcore4:i386
 The following packages will be upgraded:
   libqtcore4:i386
   libqtcore4:i386
 The following packages will be upgraded:
   libqtcore4:i386


@@ -111,7 +111,7 @@ insertinstalledpackage 'libqtcore4' 'amd64' '1' 'Multi-Arch: same' '' 'install o
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done

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

   libqtcore4
 The following packages will be upgraded:
   libqtcore4
   libqtcore4
 The following packages will be upgraded:
   libqtcore4