summaryrefslogtreecommitdiffstats
path: root/.travis-functions.sh
diff options
context:
space:
mode:
Diffstat (limited to '.travis-functions.sh')
-rwxr-xr-x.travis-functions.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/.travis-functions.sh b/.travis-functions.sh
index 3c1855951..e4318d6a6 100755
--- a/.travis-functions.sh
+++ b/.travis-functions.sh
@@ -71,6 +71,7 @@ function travis_install_script
sudo apt-get -qq update || return
sudo apt-get install -qq >/dev/null \
bc \
+ btrfs-tools \
dnsutils \
libcap-ng-dev \
libpam-dev \
@@ -78,14 +79,14 @@ function travis_install_script
gtk-doc-tools \
mdadm \
ntp \
+ socat \
|| return
- # install/upgrade custom stuff from non-official sources
- sudo add-apt-repository -y ppa:malcscott/socat || return
- sudo apt-get -qq update || return
+ # install only if available (e.g. Ubuntu Trusty)
sudo apt-get install -qq >/dev/null \
- socat \
- || return
+ libsystemd-daemon-dev \
+ libsystemd-journal-dev \
+ || true
}
function travis_before_script