diff options
| author | Michael Vogt <mvo@debian.org> | 2014-04-01 13:57:22 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-04-01 13:57:22 +0200 |
| commit | 8a1c9010137a8c49d9808f2db34b9ee277138986 (patch) | |
| tree | 5ec5c0103cb896407d8c9542fac0ec8ab3313602 /debian/tests/run-tests | |
| parent | fa55ccaa85ca8f85251300f5c5f574edc0c3ca71 (diff) | |
| parent | 417e83d0d79637266e04c98189c62ce85bcdf737 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
apt-pkg/deb/dpkgpm.cc
debian/apt.auto-removal.sh
debian/changelog
vendor/debian/sources.list.in
Diffstat (limited to 'debian/tests/run-tests')
| -rw-r--r-- | debian/tests/run-tests | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/debian/tests/run-tests b/debian/tests/run-tests index e03db9b0c..e6bc5e0d1 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -2,9 +2,6 @@ set -e -unset LANGUAGE -export LC_ALL=C - # we need the buildin webserver for the tests if [ ! -e environment.mak ]; then make startup @@ -16,4 +13,5 @@ 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_BUILD_DIR=/usr/bin \ +APT_INTEGRATION_TESTS_LIBRARY_PATH=/dev/null/does/not/exist \ ./test/integration/run-tests |