From e825742bbbbe99b99d525a3b34832b25a7396c84 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 6 Aug 2016 21:40:01 +0200 Subject: CMake: debian: Switch packaging over to CMake and dh 9 This new packaging is much easier to read, although the duplication in the install files is a bit annoying. We should probably also get rid of the movefiles for solvers, planners, and https method; but then we have to keep track of which methods exist in the apt package. Another disadvantage is that building only the documentation packages also requires building the code, as there's no way to turn off code building in the project. --- debian/tests/run-tests | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/tests/run-tests') diff --git a/debian/tests/run-tests b/debian/tests/run-tests index e33992b28..d2fa915b8 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -19,5 +19,6 @@ APT_INTEGRATION_TESTS_INTERNAL_SOLVER=/usr/lib/apt/solvers/apt \ APT_INTEGRATION_TESTS_DUMP_SOLVER=/usr/lib/apt/solvers/dump \ APT_INTEGRATION_TESTS_INTERNAL_PLANNER=/usr/lib/apt/planners/apt \ APT_INTEGRATION_TESTS_BUILD_DIR=/usr/bin \ +APT_INTEGRATION_TESTS_FTPARCHIVE_BIN_DIR=/usr/bin \ APT_INTEGRATION_TESTS_LIBRARY_PATH=/dev/null/does/not/exist \ ./test/integration/run-tests -q -- cgit v1.2.3 From 7c317e9e90ccbaaab88550f69b902e88e379055c Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 8 Aug 2016 11:31:06 +0200 Subject: debian: make autopkgtest run with CMake build dir --- debian/tests/run-tests | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'debian/tests/run-tests') 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 \ -- cgit v1.2.3