diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-13 14:29:20 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-13 14:29:20 +0100 |
| commit | 784e35e86293094bb5c1456c8f9c844df2a71f12 (patch) | |
| tree | 28073f068ca09c46c04a5ed9e047824f782b15ac /debian/tests | |
| parent | a84a4d2ab78c498d9797c07d463daec4095b37de (diff) | |
| parent | 28b4b983d95fa742a5431547285a748e8b856399 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/changelog
Diffstat (limited to 'debian/tests')
| -rw-r--r-- | debian/tests/control | 3 | ||||
| -rw-r--r-- | debian/tests/run-tests | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/debian/tests/control b/debian/tests/control index e38921c7e..ae794f762 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: @, apt, 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 diff --git a/debian/tests/run-tests b/debian/tests/run-tests index 233c5a386..d9a9db7bf 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -2,12 +2,9 @@ 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/ |