use "Restrictions: allow-stderr and avoid apt-stderr.log in debian/tests/run-tests

diff --git a/debian/tests/control b/debian/tests/control
index e38921c7e327232d0823f60409669dbc963e4ded..ae794f7627ae968d032b4a7137f0beef4f2f9f8b 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,3 @@
 Tests: run-tests
 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 233c5a386b1f80790dd87810a38f85b9ffa16ddf..d9a9db7bf1f808c0900c067879ff289554042e18 100644 (file)
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -2,12 +2,9 @@
 
 set -e
 
 
 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
 # we need the buildin webserver for the tests
 if [ ! -e environment.mak ]; then

-    ./configure
+    make startup

 fi
 make -C test/interactive-helper/
 
 fi
 make -C test/interactive-helper/