Problem: Travis does not test PGM

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:54:42 +01:00
parent f979ed4f35
commit 68ba6d17be
2 changed files with 8 additions and 2 deletions

View File

@ -41,7 +41,7 @@ matrix:
apt:
packages:
- valgrind
- env: BUILD_TYPE=default CURVE=libsodium GSSAPI=enabled
- env: BUILD_TYPE=default CURVE=libsodium GSSAPI=enabled PGM=enabled
os: linux
addons:
apt:
@ -50,10 +50,11 @@ matrix:
key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/Release.key'
packages:
- libkrb5-dev
- libpgm-dev
- libsodium-dev
- asciidoc
- xmlto
- env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled GSSAPI=enabled
- env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled GSSAPI=enabled PGM=enabled
os: linux
addons:
apt:
@ -62,6 +63,7 @@ matrix:
key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/Release.key'
packages:
- libkrb5-dev
- libpgm-dev
- libsodium-dev
- env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled
os: osx

View File

@ -40,6 +40,10 @@ if [ $BUILD_TYPE == "default" ]; then
CONFIG_OPTS+=("--with-libgssapi_krb5=yes")
fi
if [ -n "$PGM" ] && [ "$PGM" == "enabled" ]; then
CONFIG_OPTS+=("--with-pgm=yes")
fi
if [ -z $DRAFT ] || [ $DRAFT == "disabled" ]; then
CONFIG_OPTS+=("--enable-drafts=no")
elif [ $DRAFT == "enabled" ]; then