Merge remote-tracking branch 'mvo/feature/README' into debian/sid

[apt.git] / debian / tests / run-tests

diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index 233c5a386b1f80790dd87810a38f85b9ffa16ddf..308031e9d7dc71aaad21b808a6b54b66fd64591b 100644 (file)
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -2,17 +2,17 @@
 
 set -e
 
 
 set -e
 

-# 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
 # we need the buildin webserver for the tests
 if [ ! -e environment.mak ]; then

-    ./configure
+    make startup

 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 \
 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_LIBEXEC_DIR=/usr/lib/apt/ \
+APT_INTEGRATION_TESTS_INTERNAL_SOLVER=/usr/lib/apt/solvers/apt \

 APT_INTEGRATION_TESTS_BUILD_DIR=/usr/bin \
 APT_INTEGRATION_TESTS_BUILD_DIR=/usr/bin \

+APT_INTEGRATION_TESTS_LIBRARY_PATH=/dev/null/does/not/exist \

 ./test/integration/run-tests
 ./test/integration/run-tests