From: Julian Andres Klode <jak@debian.org>
Date: Tue, 23 Aug 2016 22:08:39 +0000 (+0200)
Subject: test: Explicitly pass --admindir=var/lib/dpkg to dpkg
X-Git-Tag: 1.3_rc3~10^2~15
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/f8e8a14f17cb41c588970fc57bb41fcf6058a703

test: Explicitly pass --admindir=var/lib/dpkg to dpkg

Our test suite assumes that dpkg's admindir is var/lib/dpkg. This
might not always be true; for example, on FreeBSD, it is located
at /var/db/dpkg.

Gbp-Dch: ignore
---

diff --git a/test/integration/framework b/test/integration/framework
index bf9cef4e8..827226b7d 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -407,11 +407,13 @@ EOF
 	cp "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/gdb-dpkg"
 	cat >> "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" <<EOF
 exec fakeroot '${DPKG:-dpkg}' --root='${TMPWORKINGDIRECTORY}/rootdir' \\
+	--admindir="${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg" \\
 	--log='${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log' \\
 	--force-not-root --force-bad-path "\$@"
 EOF
 	cat >> "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/gdb-dpkg" <<EOF
 exec fakeroot gdb --quiet -ex run '${DPKG:-dpkg}' --args '${DPKG:-dpkg}' --root='${TMPWORKINGDIRECTORY}/rootdir' \\
+	--admindir="${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg" \\
 	--log='${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log' \\
 	--force-not-root --force-bad-path "\$@"
 EOF