diff options
| author | Simon Warta <[email protected]> | 2015-07-12 00:24:03 +0200 |
|---|---|---|
| committer | Simon Warta <[email protected]> | 2015-07-12 00:47:55 +0200 |
| commit | faf77be90301663724dfd6cafdfad32cb25b555a (patch) | |
| tree | 80f32d1b3af398e896acae1fce407190be1c20e5 | |
| parent | d1b75ea89fa90ef9534a797c9bdb67d2f58a6d2b (diff) | |
Add modules all/min to travis matrix
| -rw-r--r-- | .travis.yml | 19 | ||||
| -rwxr-xr-x | src/scripts/ci/build.sh | 9 |
2 files changed, 21 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 35abc79d3..038334c75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,19 +26,26 @@ compiler: env: matrix: - - BUILD_MODE="shared" - - BUILD_MODE="static" - - BUILD_MODE="coverage" - - BUILD_MODE="sanitizer" + - MODULES="all" BUILD_MODE="shared" + - MODULES="all" BUILD_MODE="static" + - MODULES="all" BUILD_MODE="coverage" + - MODULES="all" BUILD_MODE="sanitizer" + + - MODULES="min" BUILD_MODE="shared" + - MODULES="min" BUILD_MODE="static" matrix: exclude: - os: osx compiler: gcc - compiler: clang - env: BUILD_MODE="coverage" + env: MODULES="all" BUILD_MODE="coverage" + - compiler: clang + env: MODULES="all" BUILD_MODE="sanitizer" + - compiler: clang + env: MODULES="min" BUILD_MODE="shared" - compiler: clang - env: BUILD_MODE="sanitizer" + env: MODULES="min" BUILD_MODE="static" # END BUILD MATRIX install: diff --git a/src/scripts/ci/build.sh b/src/scripts/ci/build.sh index c87033f68..684cca437 100755 --- a/src/scripts/ci/build.sh +++ b/src/scripts/ci/build.sh @@ -13,7 +13,14 @@ elif [ "$BUILD_MODE" = "sanitizer" ]; then CFG_FLAGS="--build-mode=sanitizer" fi +if [ "$MODULES" = "min" ]; then + CFG_FLAGS="$CFG_FLAGS --no-autoload --enable-modules=base" +fi + $CXX --version python configure.py $CFG_FLAGS --cc=$CC --cc-bin=$CXX --with-openssl --with-sqlite --with-zlib make -j 2 -./botan-test + +if [ "$MODULES" != "min" ]; then + ./botan-test +fi |