Merge branch 'master' into 'master'

Fix segfault in pkgAcquire::Enqueue() with Acquire::Queue-Mode=access

See merge request apt-team/apt!73

1 files changed, 21 insertions, 0 deletions

diff --git a/test/integration/framework b/test/integration/framework
index e7b82c273..44dedb10b 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -229,6 +229,27 @@ gdb() {
 	fi
 	runapt command gdb --quiet -ex "directory '$SOURCEDIRECTORY'" -ex run "$CMD" --args "$CMD" "$@"
 }
+
+valgrind() {
+	local CMD
+	case "$1" in
+	aptget) CMD="apt-get";;
+	aptcache) CMD="apt-cache";;
+	aptcdrom) CMD="apt-cdrom";;
+	aptconfig) CMD="apt-config";;
+	aptmark) CMD="apt-mark";;
+	apthelper) CMD="apt-helper";;
+	aptftparchive) CMD="apt-ftparchive";;
+	dpkg) shift; runapt "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/gdb-dpkg" "$@"; return;;
+	*) CMD="$1";;
+	esac
+	shift
+	if [ "${CMD##*/}" = "$CMD" ]; then
+		CMD="${BUILDDIRECTORY}/${CMD}"
+	fi
+	runapt command valgrind "$CMD" "$@"
+}
+
 lastmodification() {
 	date -u -d "@$(stat -c '%Y' "${TMPWORKINGDIRECTORY}/$1")" -R
 }