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