diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-08-08 11:31:06 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-08-10 16:11:48 +0200 |
| commit | 7c317e9e90ccbaaab88550f69b902e88e379055c (patch) | |
| tree | 8d4a424b8a6dcec3cf73f4c1398d7c4b9d8609bd | |
| parent | 06c2b40b9b9094f4f6391bd1d17cfc3725313070 (diff) | |
debian: make autopkgtest run with CMake build dir
| -rw-r--r-- | debian/tests/run-tests | 11 |
1 files changed, 6 insertions, 5 deletions
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 \ |