From 1a3ae7883f9cbab9c32a9773882f4b1d7ecf8d31 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Fri, 16 Oct 2015 11:19:04 -0400 Subject: [PATCH] Run tests on Travis for mingw builds as well Signed-off-by: Rich Salz Reviewed-by: Andy Polyakov --- .travis.yml | 10 +++++++++- Makefile.org | 4 +++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3deea542c2..5d7cf6992a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ addons: - gcc-5 - binutils-mingw-w64 - gcc-mingw-w64 + - wine sources: - llvm-toolchain-precise-3.6 - ubuntu-toolchain-r-test @@ -51,6 +52,10 @@ matrix: compiler: i686-w64-mingw32-gcc - os: osx compiler: x86_64-w64-mingw32-gcc + - compiler: i686-w64-mingw32-gcc + env: CONFIG_OPTS="shared" + - compiler: x86_64-w64-mingw32-gcc + env: CONFIG_OPTS="shared" allow_failures: - compiler: i686-w64-mingw32-gcc env: CONFIG_OPTS="--debug --strict-warnings" @@ -70,7 +75,10 @@ before_script: script: - make - - if [ -z "$CROSS_COMPILE" ]; then make test; fi + - if [ -n "$CROSS_COMPILE" ]; then + export EXE_SHELL="wine" WINEPREFIX=`pwd`; + fi + - make test notifications: email: diff --git a/Makefile.org b/Makefile.org index 3ecc5c5a0c..5aa721f277 100644 --- a/Makefile.org +++ b/Makefile.org @@ -437,7 +437,9 @@ test: tests tests: rehash @(cd test && echo "testing..." && \ $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests ); - OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a + @if [ -z "$(CROSS_COMPILE)" ]; then \ + OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a; \ + fi list-tests: @(cd test && \ -- 2.25.1