summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-10-13 12:23:25 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-10-13 12:23:25 +0200
commit4b2a4ab8abb9f9b6ce262882480eee945a041d14 (patch)
tree32f57c22ad3f33ac432d7a98208cc317ba67b2b4 /test
parent6e2398300f16741d028a022ddf73c72403728d0c (diff)
merge fix for testrun on amd64
Diffstat (limited to 'test')
-rw-r--r--test/integration/framework2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/integration/framework b/test/integration/framework
index d832bedbe..95fce1247 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -64,6 +64,8 @@ runapt() {
msgdebug "Executing: ${CCMD}$*${CDEBUG} "
if [ -f ./aptconfig.conf ]; then
APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$*
+ elif [ -f ../aptconfig.conf ]; then
+ APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$*
else
LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$*
fi