summaryrefslogtreecommitdiffstats
path: root/Makefile.org
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2015-10-16 11:19:04 -0400
committerRich Salz <rsalz@openssl.org>2015-10-16 11:20:22 -0400
commit1a3ae7883f9cbab9c32a9773882f4b1d7ecf8d31 (patch)
treeb25a62542d7ff82354dc933ee82c121fee07ae6d /Makefile.org
parent1f08d945a79ad79c98fb84167c613934ee96d8e1 (diff)
Run tests on Travis for mingw builds as well
Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Makefile.org')
-rw-r--r--Makefile.org4
1 files changed, 3 insertions, 1 deletions
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 && \