generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-06 00:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Problem: Travis does not test GSSAPI

Browse Source 
Solution: enable option and install build-dependency for the jobs that
already install packages only, to minimise marginal cost in term of
runtime
This commit is contained in:
Luca Boccassi 2017-08-19 17:51:54 +01:00
parent 8896b672c4
commit f979ed4f35
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -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:
- 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:
- 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

4
ci_build.sh
View File

@ -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