diff options
| -rw-r--r-- | .travis.yml | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index 855b580fc..606c4a236 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,39 +23,39 @@ matrix: include: - os: linux compiler: gcc - env: BUILD_TYPE=normal + env: T=normal - os: linux compiler: clang - env: BUILD_TYPE=debug + env: T=debug - os: osx compiler: gcc - env: BUILD_TYPE=debug + env: T=debug - os: osx compiler: gcc - env: BUILD_TYPE=debug C=--with-ssl=/usr/local/opt/openssl + env: T=debug C=--with-ssl=/usr/local/opt/openssl - os: osx compiler: gcc - env: BUILD_TYPE=debug C=--with-ssl=/usr/local/opt/libressl + env: T=debug C=--with-ssl=/usr/local/opt/libressl - os: osx compiler: clang - env: BUILD_TYPE=debug C="--without-ssl --with-darwinssl" + env: T=debug C="--without-ssl --with-darwinssl" - os: osx compiler: clang - env: BUILD_TYPE=normal + env: T=normal - os: linux compiler: gcc dist: trusty - env: BUILD_TYPE=cmake + env: T=cmake - os: linux compiler: clang dist: trusty - env: BUILD_TYPE=cmake + env: T=cmake - os: linux compiler: gcc - env: BUILD_TYPE=coverage + env: T=coverage - os: linux compiler: gcc - env: BUILD_TYPE=distcheck + env: T=distcheck install: - pip install --user cpp-coveralls @@ -73,7 +73,7 @@ before_script: script: - | - if [ "$BUILD_TYPE" = "coverage" ]; then + if [ "$T" = "coverage" ]; then export CC="gcc-4.8" ./configure --enable-debug --disable-shared --enable-code-coverage make @@ -84,26 +84,26 @@ script: coveralls --gcov /usr/bin/gcov-4.8 --gcov-options '\-lp' -i src -i lib -i lib/vtls -i lib/vauth -e tests -e docs fi - | - if [ "$BUILD_TYPE" = "debug" ]; then + if [ "$T" = "debug" ]; then ./configure --enable-debug --enable-werror $C make make TFLAGS=-n test-nonflaky fi - | - if [ "$BUILD_TYPE" = "normal" ]; then + if [ "$T" = "normal" ]; then ./configure --enable-warnings --enable-werror $C make make test-nonflaky fi - | - if [ "$BUILD_TYPE" = "cmake" ]; then + if [ "$T" = "cmake" ]; then mkdir build cd build cmake .. make fi - | - if [ "$BUILD_TYPE" = "distcheck" ]; then + if [ "$T" = "distcheck" ]; then ./configure make ./maketgz 99.98.97 |