test: Assert multi-arch in the chroot

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 677c40711ba842bbdab7c71072699e4f75f5d4de..546f070d706d474a313a79943fd63c06c8a8cd06 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -195,6 +195,9 @@ aptinternalplanner() { runapt "${APTINTERNALPLANNER}" "$@"; }
 dpkg() {
        "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" "$@"
 }
 dpkg() {
        "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" "$@"
 }

+dpkg_version() {
+       command perl -MDpkg -E 'say $Dpkg::PROGVERSION'
+}

 dpkgcheckbuilddeps() {
        command dpkg-checkbuilddeps --admindir="${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg" "$@"
 }
 dpkgcheckbuilddeps() {
        command dpkg-checkbuilddeps --admindir="${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg" "$@"
 }


@@ -528,7 +531,7 @@ configdpkg() {
                        insertinstalledpackage 'dpkg' "all" '1.16.2+fake'
                fi
        fi
                        insertinstalledpackage 'dpkg' "all" '1.16.2+fake'
                fi
        fi

-       if command dpkg --assert-multi-arch >/dev/null 2>&1 ; then
+       if dpkg --assert-multi-arch >/dev/null 2>&1 ; then

                local ARCHS="$(getarchitectures)"
                local DPKGARCH="$(dpkg --print-architecture)"
                # this ensures that even if multi-arch isn't active in the view
                local ARCHS="$(getarchitectures)"
                local DPKGARCH="$(dpkg --print-architecture)"
                # this ensures that even if multi-arch isn't active in the view