Run tests on Travis for mingw builds as well

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 2f8e472ccf96133bec4543ffd57010b8001faf98..5aa721f277e2b109b28d89445d5ed1d8d1d05407 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -143,7 +143,7 @@ SDIRS=  \
        bn ec rsa dsa ecdsa dh ecdh dso engine \
        buffer bio stack lhash rand err \
        evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui \
-       cms pqueue ts jpake srp store cmac
+       cms pqueue ts jpake srp store cmac ct
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
 
@@ -216,7 +216,7 @@ BUILDENV=   PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
                INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)'   \
                LIBDIR='$(LIBDIR)'                              \
                MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \
-               DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)'    \
+               DEPFLAG='$(DEPFLAG)'                            \
                MAKEDEPPROG='$(MAKEDEPPROG)'                    \
                SHARED_LDFLAGS='$(SHARED_LDFLAGS)'              \
                ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)'     \
@@ -437,7 +437,13 @@ 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 && \
+               $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. list-tests)
 
 report:
        @$(PERL) util/selftest.pl