summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-07-08 11:57:56 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2016-07-08 12:43:56 +0200
commitb327c569de774177f1505e52a378396250c975f2 (patch)
tree0fc2750d4379c9bb56521c246a48fba39cecc016 /test
parent13a6bb6d99da52cef1d195dfe37430b549ae62db (diff)
tests: fix external solver/planner directory setup
The setup didn't prepare the directories as expected by newer version of tthe external tests in an autopkgtests environment.
Diffstat (limited to 'test')
-rw-r--r--test/integration/framework17
1 files changed, 7 insertions, 10 deletions
diff --git a/test/integration/framework b/test/integration/framework
index ea9402d61..21f41aa17 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -300,18 +300,15 @@ setupenvironment() {
mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d
mkdir -p usr/bin var/cache var/lib var/log tmp
mkdir -p var/lib/dpkg/info var/lib/dpkg/updates var/lib/dpkg/triggers
+ mkdir -p usr/lib/apt/solvers usr/lib/apt/planners
touch var/lib/dpkg/available
- mkdir -p usr/lib/apt
ln -s "${METHODSDIR}" usr/lib/apt/methods
- if [ "$BUILDDIRECTORY" = "$LIBRARYPATH" ]; then
- mkdir -p usr/lib/apt/solvers usr/lib/apt/planners
- ln -s "${BUILDDIRECTORY}/apt-dump-solver" usr/lib/apt/solvers/dump
- ln -s "${BUILDDIRECTORY}/apt-dump-solver" usr/lib/apt/planners/dump
- ln -s "${BUILDDIRECTORY}/apt-internal-solver" usr/lib/apt/solvers/apt
- ln -s "${BUILDDIRECTORY}/apt-internal-planner" usr/lib/apt/planners/apt
- echo "Dir::Bin::Solvers \"${TMPWORKINGDIRECTORY}/rootdir/usr/lib/apt/solvers\";" >> ../aptconfig.conf
- echo "Dir::Bin::Planners \"${TMPWORKINGDIRECTORY}/rootdir/usr/lib/apt/planners\";" >> ../aptconfig.conf
- fi
+ ln -s "${APTDUMPSOLVER}" usr/lib/apt/solvers/dump
+ ln -s "${APTDUMPSOLVER}" usr/lib/apt/planners/dump
+ ln -s "${APTINTERNALSOLVER}" usr/lib/apt/solvers/apt
+ ln -s "${APTINTERNALPLANNER}" usr/lib/apt/planners/apt
+ echo "Dir::Bin::Solvers \"${TMPWORKINGDIRECTORY}/rootdir/usr/lib/apt/solvers\";" >> ../aptconfig.conf
+ echo "Dir::Bin::Planners \"${TMPWORKINGDIRECTORY}/rootdir/usr/lib/apt/planners\";" >> ../aptconfig.conf
# use the autoremove from the BUILDDIRECTORY if its there, otherwise
# system
if [ -e "${BUILDDIRECTORY}/../../debian/apt.conf.autoremove" ]; then