| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Add 'buildtest' and 'runtest' targets to Makefile, to build and run tests |
| 2 | cross-compiled. |
| 3 | |
| 4 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> |
| 5 | Signed-off-by: Maxin B. John <maxin.john@enea.com> |
| 6 | Upstream-Status: Pending |
| 7 | --- |
| 8 | Index: openssl-1.0.2/Makefile.org |
| 9 | =================================================================== |
| 10 | --- openssl-1.0.2.orig/Makefile.org |
| 11 | +++ openssl-1.0.2/Makefile.org |
| 12 | @@ -451,8 +451,16 @@ rehash.time: certs apps |
| 13 | test: tests |
| 14 | |
| 15 | tests: rehash |
| 16 | + $(MAKE) buildtest |
| 17 | + $(MAKE) runtest |
| 18 | + |
| 19 | +buildtest: |
| 20 | + @(cd test && \ |
| 21 | + $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf exe apps); |
| 22 | + |
| 23 | +runtest: |
| 24 | @(cd test && echo "testing..." && \ |
| 25 | - $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests ); |
| 26 | + $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf alltests ); |
| 27 | OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a |
| 28 | |
| 29 | report: |
| 30 | Index: openssl-1.0.2/test/Makefile |
| 31 | =================================================================== |
| 32 | --- openssl-1.0.2.orig/test/Makefile |
| 33 | +++ openssl-1.0.2/test/Makefile |
| 34 | @@ -137,7 +137,7 @@ tests: exe apps $(TESTS) |
| 35 | apps: |
| 36 | @(cd ..; $(MAKE) DIRS=apps all) |
| 37 | |
| 38 | -alltests: \ |
| 39 | +all-tests= \ |
| 40 | test_des test_idea test_sha test_md4 test_md5 test_hmac \ |
| 41 | test_md2 test_mdc2 test_wp \ |
| 42 | test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \ |
| 43 | @@ -148,6 +148,11 @@ alltests: \ |
| 44 | test_jpake test_srp test_cms test_ocsp test_v3name test_heartbeat \ |
| 45 | test_constant_time |
| 46 | |
| 47 | +alltests: |
| 48 | + @(for i in $(all-tests); do \ |
| 49 | + ( $(MAKE) $$i && echo "PASS: $$i" ) || echo "FAIL: $$i"; \ |
| 50 | + done) |
| 51 | + |
| 52 | test_evp: $(EVPTEST)$(EXE_EXT) evptests.txt |
| 53 | ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt |
| 54 | |
| 55 | @@ -213,7 +218,7 @@ test_x509: ../apps/openssl$(EXE_EXT) tx5 |
| 56 | echo test second x509v3 certificate |
| 57 | sh ./tx509 v3-cert2.pem 2>/dev/null |
| 58 | |
| 59 | -test_rsa: $(RSATEST)$(EXE_EXT) ../apps/openssl$(EXE_EXT) trsa testrsa.pem |
| 60 | +test_rsa: ../apps/openssl$(EXE_EXT) trsa testrsa.pem |
| 61 | @sh ./trsa 2>/dev/null |
| 62 | ../util/shlib_wrap.sh ./$(RSATEST) |
| 63 | |
| 64 | @@ -313,11 +318,11 @@ test_tsa: ../apps/openssl$(EXE_EXT) test |
| 65 | sh ./testtsa; \ |
| 66 | fi |
| 67 | |
| 68 | -test_ige: $(IGETEST)$(EXE_EXT) |
| 69 | +test_ige: |
| 70 | @echo "Test IGE mode" |
| 71 | ../util/shlib_wrap.sh ./$(IGETEST) |
| 72 | |
| 73 | -test_jpake: $(JPAKETEST)$(EXE_EXT) |
| 74 | +test_jpake: |
| 75 | @echo "Test JPAKE" |
| 76 | ../util/shlib_wrap.sh ./$(JPAKETEST) |
| 77 | |