From 8d8b45a96ceceb015f7836cf25b99279c2f377b9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 21 Apr 2022 01:45:45 +0200 Subject: Link interactive helpers against system libapt for autopkgtest Building the library just so we can build the helpers against it is not only wasteful but as we are supposed to test the system we can use that as an additional simple smoke test before the real testing starts. --- debian/tests/run-tests | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/tests/run-tests b/debian/tests/run-tests index 461042641..c7ca16b35 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -15,7 +15,7 @@ else fi if [ ! -e "${BUILD_DIR}/CMakeCache.txt" ]; then - cmake -S "$SOURCE_DIR" -B "$BUILD_DIR" + cmake -S "$SOURCE_DIR" -B "$BUILD_DIR" -DUSE_SYSTEM_APTPKG=ON -DWITH_DOC=OFF -DUSE_NLS=OFF fi make -C "${BUILD_DIR}/test/interactive-helper" @@ -24,14 +24,14 @@ make -C "${BUILD_DIR}/test/interactive-helper" # the host env does not pollute our environment env -i \ APT_INTEGRATION_TESTS_SOURCE_DIR="${SOURCE_DIR}" \ -APT_INTEGRATION_TESTS_HELPERS_BIN_DIR="${BUILD_DIR}/test/interactive-helper" \ +APT_INTEGRATION_TESTS_BUILD_DIR="${BUILD_DIR}" \ 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 \ 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_CMDLINE_BIN_DIR=/usr/bin \ APT_INTEGRATION_TESTS_LIBRARY_PATH=/dev/null/does/not/exist \ APT_INTEGRATION_TESTS_ARTIFACTS_DIR="${AUTOPKGTEST_ARTIFACTS}" \ "${SOURCE_DIR}/test/integration/run-tests" -q -- cgit v1.2.3-70-g09d2