Commit e951eca8 authored by Matt Caswell's avatar Matt Caswell
Browse files

Update Travis and Appveyor for change to shared by default 



Update the Travis and Appveyor builds to explicitly state no-shared where
applicable.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent ce942199

.travis.yml

+9 −9
Original line number Diff line number Diff line
@@ -23,28 +23,28 @@ compiler: 
    - gcc



env:

    - CONFIG_OPTS="shared"

    - CONFIG_OPTS="--debug enable-crypto-mdebug enable-rc5 enable-md2"

    - CONFIG_OPTS="--strict-warnings" BUILDONLY="yes"

    - CONFIG_OPTS=""

    - CONFIG_OPTS="--debug no-shared enable-crypto-mdebug enable-rc5 enable-md2"

    - CONFIG_OPTS="--strict-warnings no-shared" BUILDONLY="yes"

    - CONFIG_OPTS="--classic no-shared" BUILDONLY="yes"

    - CONFIG_OPTS="--classic" BUILDONLY="yes"

    - CONFIG_OPTS="--classic shared" BUILDONLY="yes"

    - CONFIG_OPTS="no-pic --strict-warnings" BUILDONLY="yes"

    - CONFIG_OPTS="no-engine --strict-warnings" BUILDONLY="yes"

    - CONFIG_OPTS="no-engine no-shared --strict-warnings" BUILDONLY="yes"



matrix:

    include:

        - os: linux

          compiler: clang-3.6

          env: CONFIG_OPTS="-fsanitize=address"

          env: CONFIG_OPTS="-fsanitize=address no-shared"

        - os: linux

          compiler: clang-3.6

          env: CONFIG_OPTS="no-asm -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2 -fno-sanitize=alignment"

          env: CONFIG_OPTS="no-shared no-asm -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2 -fno-sanitize=alignment"

        - os: linux

          compiler: gcc-5

          env: CONFIG_OPTS="-fsanitize=address"

          env: CONFIG_OPTS="no-shared -fsanitize=address"

        - os: linux

          compiler: gcc-5

          env: CONFIG_OPTS="no-asm -fno-sanitize-recover -DPEDANTIC -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2"

          env: CONFIG_OPTS="no-shared no-asm -fno-sanitize-recover -DPEDANTIC -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2"

        - os: linux

          compiler: i686-w64-mingw32-gcc

          env: CONFIG_OPTS="no-pic"

appveyor.yml

+2 −2
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ before_build: 
        }

    - ps: >-

        If ($env:Configuration -Match "shared") {

            $env:SHARED="shared"

        } Else {

            $env:SHARED=""

        } Else {

            $env:SHARED="no-shared"

        }

    - ps: $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:VSVER" + "0COMNTOOLS"))

    - call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM%