Commit b3943604 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

.travis.yml: minor optimizations:



- make 'pip install --user cpp-coveralls' conditional;
- limit no-stdio to single build per operating environment;
- omit enable-asan duplicate;

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 47d7ede8
Loading
Loading
Loading
Loading
+5 −12
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ language: c
cache: ccache

before_install:
    - pip install --user cpp-coveralls
    - if [ -n "$COVERALLS" ]; then
          pip install --user cpp-coveralls;
      fi;

addons:
    apt:
@@ -36,9 +38,6 @@ matrix:
        - os: linux
          compiler: gcc
          env: CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers" COVERALLS="yes"
        - os: linux
          compiler: clang-3.6
          env: CONFIG_OPTS="enable-asan"
        - os: linux
          compiler: clang-3.6
          env: CONFIG_OPTS="enable-msan"
@@ -48,24 +47,18 @@ matrix:
        - os: linux
          compiler: clang-3.6
          env: CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2"
        - os: linux
          compiler: clang-3.6
          env: CONFIG_OPTS="no-stdio"
        - os: linux
          compiler: gcc-5
          env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC"
        - os: linux
          compiler: i686-w64-mingw32-gcc
          env: CONFIG_OPTS="no-pic"
        - os: linux
          compiler: i686-w64-mingw32-gcc
          env: CONFIG_OPTS="no-stdio" BUILDONLY="yes"
        - os: linux
          compiler: x86_64-w64-mingw32-gcc
          compiler: i686-w64-mingw32-gcc
          env: CONFIG_OPTS="no-pic"
        - os: linux
          compiler: x86_64-w64-mingw32-gcc
          env: CONFIG_OPTS="no-stdio" BUILDONLY="yes"
          env: CONFIG_OPTS="no-pic"
    exclude:
        - os: linux
          compiler: clang