diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-09-05 14:47:22 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-09-05 14:47:22 +0200 |
| commit | 30b683f4f3021cd191ffef04bfaf2deb65820a52 (patch) | |
| tree | b58771461581111f7bbbfd8d3e8eba012dc776ff /debian/tests | |
| parent | e6e893903869635ab7ee3200f654129b08717ded (diff) | |
| parent | 8c782efd93342c6119e8ba2ff6989b7a164b7f3d (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans
Diffstat (limited to 'debian/tests')
| -rw-r--r-- | debian/tests/control | 2 | ||||
| -rw-r--r-- | debian/tests/run-tests | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/tests/control b/debian/tests/control index ecaa089d8..f7e47c5f3 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, stunnel4, libdb-dev, db-util +Depends: @, @builddeps@, fakeroot, wget, stunnel4, db-util diff --git a/debian/tests/run-tests b/debian/tests/run-tests index 308031e9d..9d7c484fc 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -8,7 +8,9 @@ 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/ \ |