diff options
| author | Michael Vogt <mvo@debian.org> | 2014-06-12 09:12:47 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-06-12 09:14:26 +0200 |
| commit | e157c79cb33584aebc7e3f1daabfd87121a7accb (patch) | |
| tree | 825a0d994d72673f84a15c15f997ac818f30586b | |
| parent | c874b784133a011f56c7dd15976928712f112269 (diff) | |
fix tests and add db-util to the test dependencies
Conflicts:
.travis.yml
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | debian/tests/control | 2 | ||||
| -rwxr-xr-x | test/integration/test-apt-ftparchive-cachedb-lp1274466 | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 2d9194c28..872ff47db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: cpp before_install: - sudo apt-get update -q - - sudo apt-get install -q --no-install-recommends 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 + - sudo apt-get install -q --no-install-recommends 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 db-util script: make && make test && test/integration/run-tests 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/test/integration/test-apt-ftparchive-cachedb-lp1274466 b/test/integration/test-apt-ftparchive-cachedb-lp1274466 index 211740a53..f26a19d83 100755 --- a/test/integration/test-apt-ftparchive-cachedb-lp1274466 +++ b/test/integration/test-apt-ftparchive-cachedb-lp1274466 @@ -47,5 +47,4 @@ Description: an autogenerated dummy foo=1/test # ensure that the db is updated db_dump old-format.db > old-format.dump -testsuccess diff -u old-format.dump new-format.dump - +testsuccess grep 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc12a0e7cadb4b66764235c56e1009dbfe8a9a566fb1eedf47a992d1fff2cc3332c old-format.dump |