From: Julian Andres Klode <jak@debian.org>
Date: Thu, 25 Aug 2016 13:02:13 +0000 (+0200)
Subject: test: Assert multi-arch in the chroot
X-Git-Tag: 1.3_rc3~10^2~3
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/f878d3a862128bc1385616751ae1d78246b1bd01

test: Assert multi-arch in the chroot

The host system might not have a dpkg installed, which makes
dpkg fail with:

  dpkg not recorded as installed, cannot check for multi-arch support!

That's entirely useless of course. We want to know if dpkg could
support multi-arch in our chroot, so we pseudo-install dpkg into
the chroot and pretend it's version is one version higher than
the minimum dpkg version, so dpkg --assert-multi-arch works on
recent dpkgs.

Gbp-Dch: ignore
---

diff --git a/test/integration/framework b/test/integration/framework
index ec57a23c3..546f070d7 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -531,7 +531,7 @@ configdpkg() {
 			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