diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-10-09 23:28:03 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-10-11 09:14:55 +0200 |
| commit | 47d7ede82f68214a431c6bb56287ae58d2e91754 (patch) | |
| tree | e5cb181078eaba8f93b0888ffb548101b334acb3 /.travis.yml | |
| parent | 0e831db0a6d89a0074d910fb6d4994a3137cfb48 (diff) | |
| download | openssl-47d7ede82f68214a431c6bb56287ae58d2e91754.tar.gz | |
.travis.yml: install wine on demand.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index f15ca6bf7e..64cb95d937 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ addons: - gcc-5 - binutils-mingw-w64 - gcc-mingw-w64 - - wine sources: - llvm-toolchain-precise-3.6 - ubuntu-toolchain-r-test @@ -60,13 +59,13 @@ matrix: env: CONFIG_OPTS="no-pic" - os: linux compiler: i686-w64-mingw32-gcc - env: CONFIG_OPTS="no-stdio" + env: CONFIG_OPTS="no-stdio" BUILDONLY="yes" - os: linux compiler: x86_64-w64-mingw32-gcc env: CONFIG_OPTS="no-pic" - os: linux compiler: x86_64-w64-mingw32-gcc - env: CONFIG_OPTS="no-stdio" + env: CONFIG_OPTS="no-stdio" BUILDONLY="yes" exclude: - os: linux compiler: clang @@ -115,6 +114,7 @@ script: - $make - if [ -z "$BUILDONLY" ]; then if [ -n "$CROSS_COMPILE" ]; then + sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install wine; export EXE_SHELL="wine" WINEPREFIX=`pwd`; fi; HARNESS_VERBOSE=yes make test; |