From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 11 Aug 2016 00:19:31 +0000 (+0200)
Subject: tests: copy 01autoremove from the right place
X-Git-Tag: 1.3_rc1~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/c21dab6848cbe90736a998cbec8050fdf5110dd7?ds=sidebyside

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
---

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