summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2016-08-24 00:08:39 +0200
committerJulian Andres Klode <jak@debian.org>2016-08-26 22:17:55 +0200
commitf8e8a14f17cb41c588970fc57bb41fcf6058a703 (patch)
tree21359f1d80063c23d0eaa9c27587c66e16a798ca
parent1a7c66e40ffd2bdd404b2efdc6dc268ebfd508ec (diff)
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
-rw-r--r--test/integration/framework2
1 files changed, 2 insertions, 0 deletions
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