summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-02-04 16:40:40 +0100
committerRichard Levitte <levitte@openssl.org>2016-02-10 14:36:04 +0100
commit9c44c29ef2cadb2f0ff214096ccf731ce2660d64 (patch)
tree3ba7bbdf2ed8921c5ced93576535aa001d83b0fa /.travis.yml
parent242ffb05a2e4aa3fc7ffc131037e077b7e242189 (diff)
unified build scheme: add instructions for travis to build with --unified
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml16
1 files changed, 16 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index e3ab38fdc6..cb23320d38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,10 @@ env:
- CONFIG_OPTS="shared"
- 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:
include:
@@ -61,11 +65,23 @@ matrix:
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"
- compiler: x86_64-w64-mingw32-gcc
env: CONFIG_OPTS="--debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
+ - compiler: i686-w64-mingw32-gcc
+ env: CONFIG_OPTS="--unified --debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
+ - compiler: x86_64-w64-mingw32-gcc
+ env: CONFIG_OPTS="--unified --debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
before_script:
- sh .travis-create-release.sh $TRAVIS_OS_NAME