summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-06-11 14:51:24 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-06-11 14:51:24 +0200
commit695939dbf7649aab9cb5501938fa46726c890b72 (patch)
tree2870015a7c850438ae403828cf3eb24c646ac72a /debian
parentafaeea148553439684e6091f282bf5a4ee5c00d6 (diff)
parent686b484b407fdbef47d9f2064284a567b72417fe (diff)
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'debian')
-rw-r--r--debian/tests/control2
-rw-r--r--debian/tests/run-tests1
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/tests/control b/debian/tests/control
index 209f16bfd..72e9deef7 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
+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, db-util
diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index e6bc5e0d1..ebea3b200 100644
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -12,6 +12,7 @@ make -C test/interactive-helper/
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_DIR=/usr/lib/apt/solvers \
APT_INTEGRATION_TESTS_BUILD_DIR=/usr/bin \
APT_INTEGRATION_TESTS_LIBRARY_PATH=/dev/null/does/not/exist \
./test/integration/run-tests