diff options
| author | Emilia Kasper <emilia@openssl.org> | 2016-03-06 21:59:53 +0100 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2016-03-06 22:37:18 +0100 |
| commit | 3135650970f280cce0fdbbf06024daa8b23bfd85 (patch) | |
| tree | b00d43528253c3cb1f0785087e9b1166c824590f /.travis.yml | |
| parent | a4cb3bc8f205383ed087f83950c42a9049db7494 (diff) | |
Trim the Travis config
- Remove no-asm. We've got to cut something, and this is at least
partially covered by the sanitizer builds.
- Remove enable-crypto-mdebug from sanitizer
builds. enable-crypto-mdebug has been shown to catch some static
initialization bugs that the standard leak sanitizer can't so
perhaps it has _some_ value; but we shouldn't let the two compete.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 198a121208..5be74f0ea2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,11 +28,9 @@ env: - CONFIG_OPTS="" - CONFIG_OPTS="shared" - CONFIG_OPTS="no-pic" - - CONFIG_OPTS="no-asm" - CONFIG_OPTS="--debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2" - CONFIG_OPTS="--unified" - CONFIG_OPTS="--unified shared" - - CONFIG_OPTS="--unified no-asm" - CONFIG_OPTS="--unified --debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2" matrix: @@ -42,13 +40,13 @@ matrix: env: CONFIG_OPTS="-fsanitize=address" - os: linux compiler: clang-3.6 - env: CONFIG_OPTS="no-asm --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-crypto-mdebug enable-rc5 enable-md2" + env: CONFIG_OPTS="no-asm --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2" - os: linux compiler: gcc-5 env: CONFIG_OPTS="-fsanitize=address" - os: linux compiler: gcc-5 - env: CONFIG_OPTS="no-asm --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-crypto-mdebug enable-rc5 enable-md2" + env: CONFIG_OPTS="no-asm --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2" - os: linux compiler: clang-3.6 env: CONFIG_OPTS="no-engine" @@ -74,17 +72,9 @@ matrix: - compiler: x86_64-w64-mingw32-gcc env: CONFIG_OPTS="shared" - compiler: i686-w64-mingw32-gcc - env: CONFIG_OPTS="no-asm" - - compiler: x86_64-w64-mingw32-gcc - env: CONFIG_OPTS="no-asm" - - compiler: i686-w64-mingw32-gcc env: CONFIG_OPTS="--unified shared" - compiler: x86_64-w64-mingw32-gcc env: CONFIG_OPTS="--unified shared" - - compiler: i686-w64-mingw32-gcc - env: CONFIG_OPTS="--unified no-asm" - - compiler: x86_64-w64-mingw32-gcc - env: CONFIG_OPTS="--unified no-asm" allow_failures: - compiler: i686-w64-mingw32-gcc env: CONFIG_OPTS="--debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2" |