sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make a couple more tests run faster. 

The point of diminishing returns has been reached.
This commit is contained in:
Nick Mathewson 2016-09-09 10:08:27 -04:00
parent 7c52109641
commit 373bfd9630
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/test_crypto.c
View File

@ -999,11 +999,11 @@ test_crypto_sha3(void *arg)
crypto_digest_free(d1);
/* Attempt to exercise the incremental hashing code by creating a randomized
* 100 KiB buffer, and hashing rand[1, 5 * Rate] bytes at a time. SHA3-512
* 30 KiB buffer, and hashing rand[1, 5 * Rate] bytes at a time. SHA3-512
* is used because it has a lowest rate of the family (the code is common,
* but the slower rate exercises more of it).
*/
const size_t bufsz = 100 * 1024;
const size_t bufsz = 30 * 1024;
size_t j = 0;
large = tor_malloc(bufsz);
crypto_rand(large, bufsz);

20
src/test/test_threads.c
View File

@ -87,11 +87,6 @@ test_threads_basic(void *arg)
char *s1 = NULL, *s2 = NULL;
int done = 0, timedout = 0;
time_t started;
#ifndef _WIN32
struct timeval tv;
tv.tv_sec=0;
tv.tv_usec=100*1000;
#endif
(void) arg;
tt_int_op(tor_threadlocal_init(&count), OP_EQ, 0);
@ -120,10 +115,8 @@ test_threads_basic(void *arg)
timedout = done = 1;
}
tor_mutex_release(thread_test_mutex_);
#ifndef _WIN32
/* Prevent the main thread from starving the worker threads. */
select(0, NULL, NULL, NULL, &tv);
#endif
tor_sleep_msec(10);
}
tor_mutex_acquire(thread_test_start1_);
tor_mutex_release(thread_test_start1_);
@ -286,16 +279,7 @@ test_threads_conditionvar(void *arg)
if (!timeout) {
tt_int_op(ti->n_shutdown, ==, 4);
} else {
#ifdef _WIN32
Sleep(500); /* msec */
#elif defined(HAVE_USLEEP)
usleep(500*1000); /* usec */
#else
{
struct tv = { 0, 500*1000 };
select(0, NULL, NULL, NULL, &tv);
}
#endif
tor_sleep_msec(200);
tor_mutex_acquire(ti->mutex);
tt_int_op(ti->n_shutdown, ==, 2);
tt_int_op(ti->n_timeouts, ==, 2);