Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental

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

diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index 6dc4eaa93a0de2ea066868f16ed65c44d9148b06..9d7c484fce66f68673c8166144bd0ef33d20498e 100644 (file)
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -2,17 +2,19 @@
 
 set -e
 
 
 set -e
 

-unset LANGUAGE
-export LC_ALL=C
-

 # we need the buildin webserver for the tests
 if [ ! -e environment.mak ]; then
     make startup
 fi
 make -C test/interactive-helper/
 
 # we need the buildin webserver for the tests
 if [ ! -e environment.mak ]; then
     make startup
 fi
 make -C test/interactive-helper/
 

-# run against the installed apt
+# run tests against the installed apt, use "env -i" to ensure
+# the host env does not pollute our environment
+env -i \

 APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR=$(pwd)/build/bin \
 APT_INTEGRATION_TESTS_METHODS_DIR=/usr/lib/apt/methods \
 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