From: Julian Andres Klode <jak@debian.org>
Date: Mon, 8 Aug 2016 09:31:06 +0000 (+0200)
Subject: debian: make autopkgtest run with CMake build dir
X-Git-Tag: 1.3_rc1~9^2~12
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/7c317e9e90ccbaaab88550f69b902e88e379055c

debian: make autopkgtest run with CMake build dir
---

diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index d2fa915b8..277594108 100644
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -2,17 +2,18 @@
 
 set -e
 
-# we need the buildin webserver for the tests
-if [ ! -e environment.mak ]; then
-    make startup
+if [ ! -e build/CMakeCache.txt ]; then
+    mkdir build || true
+    ( cd build && cmake .. )
 fi
-make -C test/interactive-helper/
+
+make -C build/test/interactive-helper
 
 # run tests against the installed apt, use "env -i" to ensure
 # the host env does not pollute our environment
 env -i \
 APT_INTEGRATION_TESTS_SOURCE_DIR=$(pwd) \
-APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR=$(pwd)/build/bin \
+APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR=$(pwd)/build/test/interactive-helper \
 APT_INTEGRATION_TESTS_METHODS_DIR=/usr/lib/apt/methods \
 APT_INTEGRATION_TESTS_LIBEXEC_DIR=/usr/lib/apt/ \
 APT_INTEGRATION_TESTS_INTERNAL_SOLVER=/usr/lib/apt/solvers/apt \