diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2022-07-18 20:26:57 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <dev@ddvo.net> | 2022-08-16 12:50:41 +0200 |
| commit | c02036e1ad759fca228a2201f1c4752670ad59bd (patch) | |
| tree | 1199bbb120e2062002e7eb6c0469f6239bc86c7b /test | |
| parent | 6212fc6814e8a8968bb35239cd454afd22b6a083 (diff) | |
| download | openssl-new-c02036e1ad759fca228a2201f1c4752670ad59bd.tar.gz | |
Rename the "timing" program to "timing_load_creds" and integrate it with test/build.info
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/18821)
Diffstat (limited to 'test')
| -rw-r--r-- | test/build.info | 9 | ||||
| -rw-r--r-- | test/certs/timing-cert.pem (renamed from test/timing-cert.pem) | 0 | ||||
| -rw-r--r-- | test/certs/timing-key.pem (renamed from test/timing-key.pem) | 0 | ||||
| -rw-r--r-- | test/timing_load_creds.c (renamed from test/timing.c) | 5 |
4 files changed, 9 insertions, 5 deletions
diff --git a/test/build.info b/test/build.info index 500999ca34..a74dd36de2 100644 --- a/test/build.info +++ b/test/build.info @@ -37,7 +37,7 @@ IF[{- !$disabled{tests} -}] sanitytest rsa_complex exdatatest bntest \ ecstresstest gmdifftest pbelutest \ destest mdc2test sha_test \ - exptest pbetest localetest evp_pkey_ctx_new_from_name\ + exptest pbetest localetest evp_pkey_ctx_new_from_name \ evp_pkey_provided_test evp_test evp_extra_test evp_extra_test2 \ evp_fetch_prov_test evp_libctx_test ossl_store_test \ v3nametest v3ext \ @@ -956,6 +956,13 @@ ENDIF INCLUDE[build_wincrypt_test]=../include DEPEND[build_wincrypt_test]=../libssl ../libcrypto + IF[{- !$disabled{shared} -}] + PROGRAMS{noinst}=timing_load_creds + SOURCE[timing_load_creds]=timing_load_creds.c + INCLUDE[timing_load_creds]=../include + DEPEND[timing_load_creds]=../libcrypto.a + ENDIF + IF[{- !$disabled{'quic'} -}] PROGRAMS{noinst}=quicapitest quic_wire_test ENDIF diff --git a/test/timing-cert.pem b/test/certs/timing-cert.pem index cc17d3ffab..cc17d3ffab 100644 --- a/test/timing-cert.pem +++ b/test/certs/timing-cert.pem diff --git a/test/timing-key.pem b/test/certs/timing-key.pem index a0b8e8dab2..a0b8e8dab2 100644 --- a/test/timing-key.pem +++ b/test/certs/timing-key.pem diff --git a/test/timing.c b/test/timing_load_creds.c index 9c3ada97e7..5189dfec67 100644 --- a/test/timing.c +++ b/test/timing_load_creds.c @@ -5,9 +5,6 @@ * this file except in compliance with the License. You can obtain a copy * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html - * - * I compiled this in the source tree this way: - * gcc -g -Iinclude a.c libcrypto.a -ldl -lpthread */ #include <stdio.h> #include <stdlib.h> @@ -20,7 +17,7 @@ #include <sys/time.h> #include <sys/resource.h> -static char *prog = "./a.out"; +static char *prog; static void readx509(const char *contents, int size) { |