summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-07-18 12:28:21 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2014-08-26 20:49:48 +0200
commit0d33183f0f6da97984bbc81dfe6d88014f6489ac (patch)
tree3831d637f43bc2b23e200e55a1986892f604f064
parent8f617600aeb931574baf0b53617e7759baa3f370 (diff)
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
-rw-r--r--.travis.yml1
-rwxr-xr-xprepare-release1
2 files changed, 1 insertions, 1 deletions
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