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>
This commit is contained in:
12
.travis.yml
12
.travis.yml
@@ -5,6 +5,9 @@ addons:
|
|||||||
packages:
|
packages:
|
||||||
- clang-3.6
|
- clang-3.6
|
||||||
- gcc-5
|
- gcc-5
|
||||||
|
- binutils-mingw-w64
|
||||||
|
- gcc-mingw-w64
|
||||||
|
- wine
|
||||||
sources:
|
sources:
|
||||||
- llvm-toolchain-precise-3.6
|
- llvm-toolchain-precise-3.6
|
||||||
- ubuntu-toolchain-r-test
|
- ubuntu-toolchain-r-test
|
||||||
@@ -45,6 +48,12 @@ matrix:
|
|||||||
- os: linux
|
- os: linux
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env: CONFIG_OPTS="no-engine" BUILDONLY="yes"
|
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:
|
exclude:
|
||||||
- os: osx
|
- os: osx
|
||||||
compiler: clang-3.6
|
compiler: clang-3.6
|
||||||
@@ -72,6 +81,9 @@ script:
|
|||||||
- cd _srcdist
|
- cd _srcdist
|
||||||
- make
|
- make
|
||||||
- if [ -z "$BUILDONLY" ]; then
|
- if [ -z "$BUILDONLY" ]; then
|
||||||
|
if [ -n "$CROSS_COMPILE" ]; then
|
||||||
|
export EXE_SHELL="wine" WINEPREFIX=`pwd`;
|
||||||
|
fi;
|
||||||
HARNESS_VERBOSE=yes make test;
|
HARNESS_VERBOSE=yes make test;
|
||||||
fi
|
fi
|
||||||
- cd ..
|
- cd ..
|
||||||
|
|||||||
Reference in New Issue
Block a user