From a782be73ac48e1e07e8af4b6c134b780027745b5 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 2 May 2016 21:57:42 +0100 Subject: [PATCH] Problem: no CI tests with DRAFT enabled Solution: do default test with DRAFT APIs enabled --- .travis.yml | 10 +++++----- ci_build.sh | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ed897d0e..c3790571 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/ci_build.sh b/ci_build.sh index 9e9f834a..43096d01 100755 --- a/ci_build.sh +++ b/ci_build.sh @@ -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 &&