summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-12-27 22:18:11 +0100
committerMichael Vogt <mvo@debian.org>2013-12-27 22:18:11 +0100
commitc43b8efce3f485b9ddafdc1f37e5b988151dd62f (patch)
tree542a3ff7db1c4a2ec99c7073d0b0a040597f7f6d /debian
parenta2228a452bd3be54eaba1047726a79509150c2da (diff)
parent5c0dd6fc637358094c9f0f9c98b9cd697090a529 (diff)
Merge branch 'feature/tests-on-installed' into debian/sid
Diffstat (limited to 'debian')
-rw-r--r--debian/tests/run-tests17
1 files changed, 14 insertions, 3 deletions
diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index 6ea503568..233c5a386 100644
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -2,6 +2,17 @@
set -e
-make
-make test
-test/integration/run-tests
+# auto-package-test is very unhappy if stuff it writen to stderr
+exec 2> apt-stderr.log
+
+# we need the buildin webserver for the tests
+if [ ! -e environment.mak ]; then
+ ./configure
+fi
+make -C test/interactive-helper/
+
+# run against the installed apt
+APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR=$(pwd)/build/bin \
+APT_INTEGRATION_TESTS_METHODS_DIR=/usr/lib/apt/methods \
+APT_INTEGRATION_TESTS_BUILD_DIR=/usr/bin \
+./test/integration/run-tests