diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-04-01 12:28:56 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-04-01 12:28:56 +0200 |
| commit | be20eef52da4b7f361333ea70a8d705a98ae779e (patch) | |
| tree | 4177a110ce6b1335fc4b85d5e53b298a65661f39 /debian/tests | |
| parent | a555cf8be53d8b5557f004ecbde8482a169b79f3 (diff) | |
| parent | 21b3eac8f9ab8e12b43fa8998a5aa5465f29adc5 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-manpage
Conflicts:
cmdline/apt.cc
Diffstat (limited to 'debian/tests')
| -rw-r--r-- | debian/tests/control | 3 | ||||
| -rw-r--r-- | debian/tests/run-tests | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/debian/tests/control b/debian/tests/control index e38921c7e..209f16bfd 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,2 +1,3 @@ Tests: run-tests -Depends: @, 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
\ No newline at end of file +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 diff --git a/debian/tests/run-tests b/debian/tests/run-tests index 233c5a386..e6bc5e0d1 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -2,17 +2,16 @@ 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 - ./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 \ +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 |