diff options
author | Michael Vogt <mvo@ubuntu.com> | 2014-10-06 17:42:39 +0200 |
---|---|---|
committer | Michael Vogt <mvo@ubuntu.com> | 2014-10-06 17:42:39 +0200 |
commit | a2d40703e4a5590a689ace4466f92e590434944d (patch) | |
tree | 5e878fcc11eb94d96c65940ef3d30e922f217950 /debian/tests | |
parent | ffd2dd93a640b47663ebdccc4fda00b426b3db71 (diff) | |
parent | 00a06b8eb82cf930511fc003bd16d7034e5a0cb5 (diff) |
make http size check work
Diffstat (limited to 'debian/tests')
-rw-r--r-- | debian/tests/control | 4 | ||||
-rw-r--r-- | debian/tests/run-tests | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/debian/tests/control b/debian/tests/control index 209f16bfd..0e774d4ca 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ Tests: run-tests -Restrictions: allow-stderr -Depends: @, build-essential, fakeroot, wget, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4, libdb-dev +Restrictions: allow-stderr +Depends: @, @builddeps@, fakeroot, wget, stunnel4, db-util, gnupg, gnupg2 diff --git a/debian/tests/run-tests b/debian/tests/run-tests index e6bc5e0d1..9d7c484fc 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -8,10 +8,13 @@ if [ ! -e environment.mak ]; then 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_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_LIBRARY_PATH=/dev/null/does/not/exist \ ./test/integration/run-tests |