summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorMartin Pitt <martin@piware.de>2010-10-13 14:22:29 +0200
committerMartin Pitt <martin@piware.de>2010-10-13 14:22:29 +0200
commiteff581c2d4740bc439522e44538fd6f7f4069e06 (patch)
tree1ae241ddb802d596cf5fda083d6eb38f93ecb34d /test/integration
parent9c182afa045dc889a5025d166328c6115924d706 (diff)
parentea38b1e608db857d4845b7bf6275b2df1fb8c9e7 (diff)
merge from trunk
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/framework2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/integration/framework b/test/integration/framework
index c09afcbad..e2c5234e2 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