Problem: no CI tests with DRAFT enabled

Solution: do default test with DRAFT APIs enabled
This commit is contained in:
Luca Boccassi 2016-05-02 21:57:42 +01:00
parent 6de24c190a
commit a782be73ac
2 changed files with 11 additions and 5 deletions

View File

@ -9,19 +9,19 @@ os:
dist: trusty
env:
- BUILD_TYPE=default CURVE=tweetnacl
- BUILD_TYPE=default CURVE=tweetnacl DRAFT=enabled
- BUILD_TYPE=android CURVE=tweetnacl
- BUILD_TYPE=cmake CURVE=tweetnacl
- BUILD_TYPE=default CURVE=libsodium
- BUILD_TYPE=default
- BUILD_TYPE=coverage CURVE=tweetnacl
- BUILD_TYPE=valgrind CURVE=tweetnacl
- BUILD_TYPE=coverage CURVE=tweetnacl DRAFT=enabled
- BUILD_TYPE=valgrind CURVE=tweetnacl DRAFT=enabled
matrix:
exclude:
- env: BUILD_TYPE=coverage CURVE=tweetnacl
- env: BUILD_TYPE=coverage CURVE=tweetnacl DRAFT=enabled
os: osx
- env: BUILD_TYPE=valgrind CURVE=tweetnacl
- env: BUILD_TYPE=valgrind CURVE=tweetnacl DRAFT=enabled
os: osx
include:
- env: BUILD_TYPE=default CURVE=tweetnacl IPv6=ON

View File

@ -23,6 +23,12 @@ if [ $BUILD_TYPE == "default" ]; then
( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make check; make install)
fi
if [ -z $DRAFT ] || [ $DRAFT == "disabled" ]; then
CONFIG_OPTS+=("--enable-drafts=no")
elif [ $DRAFT == "enabled" ]; then
CONFIG_OPTS+=("--enable-drafts=yes")
fi
# Build and check this project
(
./autogen.sh &&