restore usage of -elapsed that was disabled in the ifdef reorg

Reviewed-by: Ben Laurie <ben@openssl.org>
This commit is contained in:
Tim Hudson 2015-08-17 22:16:39 +10:00
parent eb647452eb
commit 686e344918

View File

@ -364,10 +364,8 @@ OPTIONS speed_options[] = {
{"mr", OPT_MR, '-', "Produce machine readable output"},
{"mb", OPT_MB, '-'},
{"misalign", OPT_MISALIGN, 'n', "Amount to mis-align buffers"},
#if defined(TIMES) || defined(USE_TOD)
{"elapsed", OPT_ELAPSED, '-',
"Measure time in real time instead of CPU user time"},
#endif
#ifndef NO_FORK
{"multi", OPT_MULTI, 'p', "Run benchmarks in parallel"},
#endif
@ -755,9 +753,6 @@ int speed_main(int argc, char **argv)
long ecdh_c[EC_NUM][2];
int ecdh_doit[EC_NUM];
#endif
#ifndef TIMES
usertime = -1;
#endif
memset(results, 0, sizeof(results));
#ifndef OPENSSL_NO_DSA