TeaSpeak/tomcrypt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix tests when compiled for pthread

Browse Source
This commit is contained in:
Steffen Jaeckel 2017-06-09 13:34:26 +02:00
parent b38cf104f0
commit a06cba4cb5
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/test.c
View File

@ -32,6 +32,10 @@ static const test_function test_functions[] =
LTC_TEST_FN(katja_test), LTC_TEST_FN(katja_test),
LTC_TEST_FN(file_test), LTC_TEST_FN(file_test),
LTC_TEST_FN(multi_test), LTC_TEST_FN(multi_test),
/* keep the prng_test always at the end as
* it has to be handled specially when
* testing with LTC_PTHREAD enabled
*/
LTC_TEST_FN(prng_test), LTC_TEST_FN(prng_test),
}; };
@ -72,7 +76,7 @@ typedef struct
pthread_t thread_id; pthread_t thread_id;
const test_function* t; const test_function* t;
int err; int err;
ulong64 ts; ulong64 delta;
} thread_info; } thread_info;
static void *run(void *arg) static void *run(void *arg)
@ -82,7 +86,7 @@ static void *run(void *arg)
ts = epoch_usec(); ts = epoch_usec();
tinfo->err = tinfo->t->fn(); tinfo->err = tinfo->t->fn();
tinfo->ts = epoch_usec() - ts; tinfo->delta = epoch_usec() - ts;
return arg; return arg;
} }
@ -322,6 +326,7 @@ int main(int argc, char **argv)
if (fn_len < len) fn_len = len; if (fn_len < len) fn_len = len;
#ifdef LTC_PTHREAD #ifdef LTC_PTHREAD
if(test_functions[i].fn == prng_test) continue;
tinfo[i].t = &test_functions[i]; tinfo[i].t = &test_functions[i];
x = pthread_create(&tinfo[i].thread_id, NULL, run, &tinfo[i]); x = pthread_create(&tinfo[i].thread_id, NULL, run, &tinfo[i]);
if (x != 0) { if (x != 0) {
@ -348,20 +353,26 @@ int main(int argc, char **argv)
fflush(stdout); fflush(stdout);
#ifdef LTC_PTHREAD #ifdef LTC_PTHREAD
x = pthread_join(tinfo[i].thread_id, (void**)&res); if(test_functions[i].fn != prng_test) {
if (x != 0){ x = pthread_join(tinfo[i].thread_id, (void**)&res);
printf("\n\nFAILURE: pthread_join\n"); if (x != 0){
return EXIT_FAILURE; printf("\n\nFAILURE: pthread_join\n");
return EXIT_FAILURE;
}
x = res->err;
delta = res->delta;
}
else {
ts = epoch_usec();
x = test_functions[i].fn();
delta = (long)(epoch_usec() - ts);
} }
ts = res->ts;
x = res->err;
#else #else
ts = epoch_usec(); ts = epoch_usec();
x = test_functions[i].fn(); x = test_functions[i].fn();
delta = (long)(epoch_usec() - ts); delta = (long)(epoch_usec() - ts);
dur += delta;
#endif #endif
real += dur; real += delta;
if (x == CRYPT_OK) { if (x == CRYPT_OK) {
printf("passed %10.3fms", (double)(delta)/1000); printf("passed %10.3fms", (double)(delta)/1000);