Commit f979ed4f authored by Luca Boccassi's avatar Luca Boccassi

Problem: Travis does not test GSSAPI

Solution: enable option and install build-dependency for the jobs that
already install packages only, to minimise marginal cost in term of
runtime
parent 8896b672
...@@ -41,7 +41,7 @@ matrix: ...@@ -41,7 +41,7 @@ matrix:
apt: apt:
packages: packages:
- valgrind - valgrind
- env: BUILD_TYPE=default CURVE=libsodium - env: BUILD_TYPE=default CURVE=libsodium GSSAPI=enabled
os: linux os: linux
addons: addons:
apt: apt:
...@@ -49,10 +49,11 @@ matrix: ...@@ -49,10 +49,11 @@ matrix:
- sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/ ./' - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/ ./'
key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/Release.key' key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/Release.key'
packages: packages:
- libkrb5-dev
- libsodium-dev - libsodium-dev
- asciidoc - asciidoc
- xmlto - xmlto
- env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled - env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled GSSAPI=enabled
os: linux os: linux
addons: addons:
apt: apt:
...@@ -60,6 +61,7 @@ matrix: ...@@ -60,6 +61,7 @@ matrix:
- sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/ ./' - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/ ./'
key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/Release.key' key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/Release.key'
packages: packages:
- libkrb5-dev
- libsodium-dev - libsodium-dev
- env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled - env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled
os: osx os: osx
......
...@@ -36,6 +36,10 @@ if [ $BUILD_TYPE == "default" ]; then ...@@ -36,6 +36,10 @@ if [ $BUILD_TYPE == "default" ]; then
fi fi
fi fi
if [ -n "$GSSAPI" ] && [ "$GSSAPI" == "enabled" ]; then
CONFIG_OPTS+=("--with-libgssapi_krb5=yes")
fi
if [ -z $DRAFT ] || [ $DRAFT == "disabled" ]; then if [ -z $DRAFT ] || [ $DRAFT == "disabled" ]; then
CONFIG_OPTS+=("--enable-drafts=no") CONFIG_OPTS+=("--enable-drafts=no")
elif [ $DRAFT == "enabled" ]; then elif [ $DRAFT == "enabled" ]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment