summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-11-30 19:23:54 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-11-30 19:23:54 +0100
commitb6b5a542bd5a2580fff3d3ec2ce91a41e9622d6d (patch)
treea95c29045d3dad43089fa976deda3f608b3c3825 /test
parentceabaaa1f96eeb433a0530dc8f9d590bc57aa161 (diff)
add framework code to run the installed aptitude with the current
build library in the test environment
Diffstat (limited to 'test')
-rw-r--r--test/integration/framework9
1 files changed, 9 insertions, 0 deletions
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)