diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-10-10 12:22:10 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-10-11 09:16:15 +0200 |
| commit | b3943604f54239518dfd9dac492e5200f902c719 (patch) | |
| tree | 6c17386b7acf8de7c0e8bb90ca51d66161cf75d0 /.travis.yml | |
| parent | 47d7ede82f68214a431c6bb56287ae58d2e91754 (diff) | |
.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: Richard Levitte <levitte@openssl.org>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 64cb95d937..9434f877d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: @@ -38,9 +40,6 @@ matrix: 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" - os: linux compiler: clang-3.6 @@ -49,23 +48,17 @@ matrix: 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 |