diff options
| author | Matt Caswell <matt@openssl.org> | 2016-04-14 14:28:13 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-14 22:23:12 +0100 |
| commit | e951eca8b4bfd58f37b25d4ded6c770812443c23 (patch) | |
| tree | 94a71829901bd5393684f4fa7158f2243ddd48b5 | |
| parent | ce942199dbfc3fe8c72c60e7e0878f32b168f327 (diff) | |
| download | openssl-e951eca8b4bfd58f37b25d4ded6c770812443c23.tar.gz | |
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: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | .travis.yml | 18 | ||||
| -rw-r--r-- | appveyor.yml | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 62675da039..f180a446ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" diff --git a/appveyor.yml b/appveyor.yml index 7496a9b3f3..46eaf3978b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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% |