From 0d33183f0f6da97984bbc81dfe6d88014f6489ac Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 18 Jul 2014 12:28:21 +0200 Subject: parse debian/tests/control for test dependencies Our integration tests need some additional dependencies to run and function correctly, but while multiple places run them, there is no need to also specify the these dependencies in multiple places. Git-Dch: Ignore --- .travis.yml | 1 - prepare-release | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2852db483..b449aeba5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,4 @@ language: cpp before_install: - sudo apt-get update -q - sudo ./prepare-release travis-ci - - sudo apt-get install -q --no-install-recommends stunnel4 db-util script: make && make test && test/integration/run-tests diff --git a/prepare-release b/prepare-release index 3c81a21cb..0b7acc165 100755 --- a/prepare-release +++ b/prepare-release @@ -105,6 +105,7 @@ elif [ "$1" = 'buildlog' ]; then done elif [ "$1" = 'travis-ci' ]; then apt-get install -q --no-install-recommends $(sed -n -e '/^Build-Depends: /,/^Build-Depends-Indep: / {p}' debian/control | sed -e 's#([^)]*)##g' -e 's#^Build-Depends\(-Indep\)\?: ##' | tr -d ',') + apt-get install -q --no-install-recommends $(sed -n 's#^Depends: .*@, \(.*\)$#\1#p' debian/tests/control | tr -d ',') else echo >&1 "Usage:\t$0 pre-export \t$0 post-build -- cgit v1.2.3