| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From a176c69f4fdfbfa7e4ccb79d91c3b6602da7e69a Mon Sep 17 00:00:00 2001 |
| 2 | From: Anders Roxell <anders.roxell@enea.com> |
| 3 | Date: Thu, 24 Apr 2014 19:28:25 +0200 |
| 4 | Subject: [PATCH 19/28] openssl: enable ptest support |
| 5 | |
| 6 | Add 'buildtest' and 'runtest' targets to Makefile, to build and run tests |
| 7 | cross-compiled. |
| 8 | |
| 9 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> |
| 10 | Signed-off-by: Maxin B. John <maxin.john@enea.com> |
| 11 | Upstream-Status: Pending |
| 12 | |
| 13 | --- |
| 14 | Makefile.org | 10 +- |
| 15 | Makefile.org.orig | 7 +- |
| 16 | test/Makefile | 13 +- |
| 17 | test/Makefile.orig | 987 +++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| 18 | 4 files changed, 1009 insertions(+), 8 deletions(-) |
| 19 | create mode 100644 test/Makefile.orig |
| 20 | |
| 21 | diff --git a/Makefile.org b/Makefile.org |
| 22 | index 111fbba..8e7936c 100644 |
| 23 | --- a/Makefile.org |
| 24 | +++ b/Makefile.org |
| 25 | @@ -468,8 +468,16 @@ rehash.time: certs apps |
| 26 | test: tests |
| 27 | |
| 28 | tests: rehash |
| 29 | + $(MAKE) buildtest |
| 30 | + $(MAKE) runtest |
| 31 | + |
| 32 | +buildtest: |
| 33 | + @(cd test && \ |
| 34 | + $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf exe apps); |
| 35 | + |
| 36 | +runtest: |
| 37 | @(cd test && echo "testing..." && \ |
| 38 | - $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests ); |
| 39 | + $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf alltests ); |
| 40 | OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a |
| 41 | |
| 42 | report: |
| 43 | diff --git a/test/Makefile b/test/Makefile |
| 44 | index a1f7eeb..b2984c4 100644 |
| 45 | --- a/test/Makefile |
| 46 | +++ b/test/Makefile |
| 47 | @@ -150,7 +150,7 @@ tests: exe apps $(TESTS) |
| 48 | apps: |
| 49 | @(cd ..; $(MAKE) DIRS=apps all) |
| 50 | |
| 51 | -alltests: \ |
| 52 | +all-tests= \ |
| 53 | test_des test_idea test_sha test_md4 test_md5 test_hmac \ |
| 54 | test_md2 test_mdc2 test_wp \ |
| 55 | test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \ |
| 56 | @@ -162,6 +162,11 @@ alltests: \ |
| 57 | test_constant_time test_verify_extra test_clienthello test_sslv2conftest \ |
| 58 | test_dtls test_bad_dtls test_fatalerr |
| 59 | |
| 60 | +alltests: |
| 61 | + @(for i in $(all-tests); do \ |
| 62 | + ( $(MAKE) $$i && echo "PASS: $$i" ) || echo "FAIL: $$i"; \ |
| 63 | + done) |
| 64 | + |
| 65 | test_evp: $(EVPTEST)$(EXE_EXT) evptests.txt |
| 66 | ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt |
| 67 | |
| 68 | @@ -230,7 +235,7 @@ test_x509: ../apps/openssl$(EXE_EXT) tx509 testx509.pem v3-cert1.pem v3-cert2.pe |
| 69 | echo test second x509v3 certificate |
| 70 | sh ./tx509 v3-cert2.pem 2>/dev/null |
| 71 | |
| 72 | -test_rsa: $(RSATEST)$(EXE_EXT) ../apps/openssl$(EXE_EXT) trsa testrsa.pem |
| 73 | +test_rsa: ../apps/openssl$(EXE_EXT) trsa testrsa.pem |
| 74 | @sh ./trsa 2>/dev/null |
| 75 | ../util/shlib_wrap.sh ./$(RSATEST) |
| 76 | |
| 77 | @@ -331,11 +336,11 @@ test_tsa: ../apps/openssl$(EXE_EXT) testtsa CAtsa.cnf ../util/shlib_wrap.sh |
| 78 | sh ./testtsa; \ |
| 79 | fi |
| 80 | |
| 81 | -test_ige: $(IGETEST)$(EXE_EXT) |
| 82 | +test_ige: |
| 83 | @echo "Test IGE mode" |
| 84 | ../util/shlib_wrap.sh ./$(IGETEST) |
| 85 | |
| 86 | -test_jpake: $(JPAKETEST)$(EXE_EXT) |
| 87 | +test_jpake: |
| 88 | @echo "Test JPAKE" |
| 89 | ../util/shlib_wrap.sh ./$(JPAKETEST) |
| 90 | |
| 91 | -- |
| 92 | 2.15.1 |
| 93 | |