From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 30 Nov 2010 18:23:54 +0000 (+0100)
Subject: add framework code to run the installed aptitude with the current
X-Git-Tag: 0.8.11~5^2^2^2~48
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/b6b5a542bd5a2580fff3d3ec2ce91a41e9622d6d?ds=sidebyside

add framework code to run the installed aptitude with the current
build library in the test environment
---

diff --git a/test/integration/framework b/test/integration/framework
index a0bad4170..8abefc814 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -78,6 +78,15 @@ aptkey() { runapt apt-key $*; }
 dpkg() {
 	$(which dpkg) --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log $*
 }
+aptitude() {
+	if [ -f ./aptconfig.conf ]; then
+		APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY}  $(which aptitude) $*
+	elif [ -f ../aptconfig.conf ]; then
+		APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} $(which aptitude) $*
+	else
+		LD_LIBRARY_PATH=${BUILDDIRECTORY}  $(which aptitude) $*
+	fi
+}
 
 setupenvironment() {
 	TMPWORKINGDIRECTORY=$(mktemp -d)