diff options
| author | Emilia Kasper <emilia@openssl.org> | 2016-03-07 12:59:40 +0100 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2016-03-07 14:53:38 +0100 |
| commit | 56cd71b46e5fe4f403c6247d83c2ad88e537b6c3 (patch) | |
| tree | 2499fa41e5ddb01f42d3da16ca9ed0bfa33ba706 /.travis.yml | |
| parent | 6e42e3ff9cde43830555549fdafa2a8b37b9485b (diff) | |
Restore some mingw builds
"no-pic" builds have in fact been green (and reasonably fast), so
restore them while we figure out why tests without "no-pic" hang.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 5407b5f90f..f43bd1007d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,9 @@ addons: packages: - clang-3.6 - gcc-5 + - binutils-mingw-w64 + - gcc-mingw-w64 + - wine sources: - llvm-toolchain-precise-3.6 - ubuntu-toolchain-r-test @@ -45,6 +48,12 @@ matrix: - os: linux compiler: clang env: CONFIG_OPTS="no-engine" BUILDONLY="yes" + - os: linux + compiler: i686-w64-mingw32-gcc + env: CONFIG_OPTS="no-pic" + - os: linux + compiler: x86_64-w64-mingw32-gcc + env: CONFIG_OPTS="no-pic" exclude: - os: osx compiler: clang-3.6 @@ -72,6 +81,9 @@ script: - cd _srcdist - make - if [ -z "$BUILDONLY" ]; then + if [ -n "$CROSS_COMPILE" ]; then + export EXE_SHELL="wine" WINEPREFIX=`pwd`; + fi; HARNESS_VERBOSE=yes make test; fi - cd .. |