diff options
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch b/meta/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch index ac53a9142b..249446a5bd 100644 --- a/meta/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch +++ b/meta/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch | |||
@@ -5,10 +5,11 @@ Signed-off-by: Anders Roxell <anders.roxell@enea.com> | |||
5 | Signed-off-by: Maxin B. John <maxin.john@enea.com> | 5 | Signed-off-by: Maxin B. John <maxin.john@enea.com> |
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | --- | 7 | --- |
8 | diff -uNr a/Makefile b/Makefile | 8 | Index: openssl-1.0.2/Makefile.org |
9 | --- a/Makefile.org 2012-05-10 17:06:02.000000000 +0200 | 9 | =================================================================== |
10 | +++ b/Makefile.org 2012-10-27 00:05:55.359424024 +0200 | 10 | --- openssl-1.0.2.orig/Makefile.org |
11 | @@ -411,8 +411,16 @@ | 11 | +++ openssl-1.0.2/Makefile.org |
12 | @@ -451,8 +451,16 @@ rehash.time: certs apps | ||
12 | test: tests | 13 | test: tests |
13 | 14 | ||
14 | tests: rehash | 15 | tests: rehash |
@@ -26,11 +27,11 @@ diff -uNr a/Makefile b/Makefile | |||
26 | OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a | 27 | OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a |
27 | 28 | ||
28 | report: | 29 | report: |
29 | diff --git a/test/Makefile b/test/Makefile | 30 | Index: openssl-1.0.2/test/Makefile |
30 | index 3912f82..1696767 100644 | 31 | =================================================================== |
31 | --- a/test/Makefile | 32 | --- openssl-1.0.2.orig/test/Makefile |
32 | +++ b/test/Makefile | 33 | +++ openssl-1.0.2/test/Makefile |
33 | @@ -128,7 +128,7 @@ tests: exe apps $(TESTS) | 34 | @@ -137,7 +137,7 @@ tests: exe apps $(TESTS) |
34 | apps: | 35 | apps: |
35 | @(cd ..; $(MAKE) DIRS=apps all) | 36 | @(cd ..; $(MAKE) DIRS=apps all) |
36 | 37 | ||
@@ -39,28 +40,28 @@ index 3912f82..1696767 100644 | |||
39 | test_des test_idea test_sha test_md4 test_md5 test_hmac \ | 40 | test_des test_idea test_sha test_md4 test_md5 test_hmac \ |
40 | test_md2 test_mdc2 test_wp \ | 41 | test_md2 test_mdc2 test_wp \ |
41 | test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \ | 42 | test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \ |
42 | @@ -138,6 +138,11 @@ alltests: \ | 43 | @@ -148,6 +148,11 @@ alltests: \ |
43 | test_ss test_ca test_engine test_evp test_ssl test_tsa test_ige \ | 44 | test_jpake test_srp test_cms test_ocsp test_v3name test_heartbeat \ |
44 | test_jpake test_cms | 45 | test_constant_time |
45 | 46 | ||
46 | +alltests: | 47 | +alltests: |
47 | + @(for i in $(all-tests); do \ | 48 | + @(for i in $(all-tests); do \ |
48 | + ( $(MAKE) $$i && echo "PASS: $$i" ) || echo "FAIL: $$i"; \ | 49 | + ( $(MAKE) $$i && echo "PASS: $$i" ) || echo "FAIL: $$i"; \ |
49 | + done) | 50 | + done) |
50 | + | 51 | + |
51 | test_evp: | 52 | test_evp: $(EVPTEST)$(EXE_EXT) evptests.txt |
52 | ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt | 53 | ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt |
53 | 54 | ||
54 | @@ -203,7 +208,7 @@ test_x509: | 55 | @@ -213,7 +218,7 @@ test_x509: ../apps/openssl$(EXE_EXT) tx5 |
55 | echo test second x509v3 certificate | 56 | echo test second x509v3 certificate |
56 | sh ./tx509 v3-cert2.pem 2>/dev/null | 57 | sh ./tx509 v3-cert2.pem 2>/dev/null |
57 | 58 | ||
58 | -test_rsa: $(RSATEST)$(EXE_EXT) | 59 | -test_rsa: $(RSATEST)$(EXE_EXT) ../apps/openssl$(EXE_EXT) trsa testrsa.pem |
59 | +test_rsa: | 60 | +test_rsa: ../apps/openssl$(EXE_EXT) trsa testrsa.pem |
60 | @sh ./trsa 2>/dev/null | 61 | @sh ./trsa 2>/dev/null |
61 | ../util/shlib_wrap.sh ./$(RSATEST) | 62 | ../util/shlib_wrap.sh ./$(RSATEST) |
62 | 63 | ||
63 | @@ -298,11 +303,11 @@ test_tsa: | 64 | @@ -313,11 +318,11 @@ test_tsa: ../apps/openssl$(EXE_EXT) test |
64 | sh ./testtsa; \ | 65 | sh ./testtsa; \ |
65 | fi | 66 | fi |
66 | 67 | ||
@@ -73,3 +74,4 @@ index 3912f82..1696767 100644 | |||
73 | +test_jpake: | 74 | +test_jpake: |
74 | @echo "Test JPAKE" | 75 | @echo "Test JPAKE" |
75 | ../util/shlib_wrap.sh ./$(JPAKETEST) | 76 | ../util/shlib_wrap.sh ./$(JPAKETEST) |
77 | |||