summaryrefslogtreecommitdiff
path: root/test/integration/framework
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-08-11 02:19:31 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2016-08-11 02:19:31 +0200
commitc21dab6848cbe90736a998cbec8050fdf5110dd7 (patch)
tree011b3e0ca3ad51d7f62c5885ff21f3daef0c369f /test/integration/framework
parent0a7370ca91289db3d23d72aeac397edfe3dfb75b (diff)
tests: copy 01autoremove from the right place
With cmake using BUILDDIRECTORY at this place is not only as wrong as it was before, but it might not even work always copying the system provided one which might or might not be current and hence fails tests needing it to be current like ./test-apt-move-and-forget-manual-sections We don't want to always use the one from the source directory through either like in autopkgtests. Gbp-Dch: Ignore
Diffstat (limited to 'test/integration/framework')
-rw-r--r--test/integration/framework4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/framework b/test/integration/framework
index 0f442dff4..8a95d79bb 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -332,8 +332,8 @@ setupenvironment() {
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
- ln -s "${BUILDDIRECTORY}/../../debian/apt.conf.autoremove" etc/apt/apt.conf.d/01autoremove
+ if [ -z "${APT_INTEGRATION_TESTS_SOURCE_DIR}" ]; then
+ ln -s "${SOURCEDIRECTORY}/debian/apt.conf.autoremove" etc/apt/apt.conf.d/01autoremove
else
ln -s /etc/apt/apt.conf.d/01autoremove etc/apt/apt.conf.d/01autoremove
fi