wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Run tests on Travis for mingw builds as well

Browse source 
Signed-off-by: Rich Salz <rsalz@akamai.com>
Reviewed-by: Andy Polyakov <appro@openssl.org>
This commit is contained in:
Rich Salz 2015-10-16 11:19:04 -04:00 committed by Rich Salz
parent 1f08d945a7
commit 1a3ae7883f
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml
View file

@ -7,6 +7,7 @@ addons:
- gcc-5 - gcc-5
- binutils-mingw-w64 - binutils-mingw-w64
- gcc-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
@ -51,6 +52,10 @@ matrix:
compiler: i686-w64-mingw32-gcc compiler: i686-w64-mingw32-gcc
- os: osx - os: osx
compiler: x86_64-w64-mingw32-gcc 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: allow_failures:
- compiler: i686-w64-mingw32-gcc - compiler: i686-w64-mingw32-gcc
env: CONFIG_OPTS="--debug --strict-warnings" env: CONFIG_OPTS="--debug --strict-warnings"
@ -70,7 +75,10 @@ before_script:
script: script:
- make - make
- if [ -z "$CROSS_COMPILE" ]; then make test; fi - if [ -n "$CROSS_COMPILE" ]; then
export EXE_SHELL="wine" WINEPREFIX=`pwd`;
fi
- make test
notifications: notifications:
email: email:

4
Makefile.org
View file

@ -437,7 +437,9 @@ test: tests
tests: rehash tests: rehash
@(cd test && echo "testing..." && \ @(cd test && echo "testing..." && \
$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests ); $(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: list-tests:
@(cd test && \ @(cd test && \