diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-10-13 12:04:33 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-10-13 12:04:33 +0200 |
| commit | 2c53e7d1a82e2bfe44151ac9d1ac2043fca09efa (patch) | |
| tree | dbc4def90169a7dd3519d83e91e7e5a698a2be45 /test/integration | |
| parent | cd34cff9ba86412cde34ec94f28b21d4e15b1447 (diff) | |
test/integration/framework: look for ../aptconfig.conf as well to fix test failure on amd64
Diffstat (limited to 'test/integration')
| -rw-r--r-- | test/integration/framework | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/integration/framework b/test/integration/framework index a515ce070..2d9ed3503 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 |