Commit 31356509 authored by Emilia Kasper's avatar Emilia Kasper
Browse files

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: default avatarRichard Levitte <levitte@openssl.org>
parent a4cb3bc8

.travis.yml

+2 −12
Original line number Diff line number Diff line
@@ -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"
@@ -73,18 +71,10 @@ matrix: 
          env: CONFIG_OPTS="shared"

        - 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"