diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-26 11:03:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-26 11:03:56 -0400 |
| commit | 6330d2d9e6dc8cdeceea9486ad96e57487d6d232 (patch) | |
| tree | 7f0e2e71b48b3f2770c321dba31040edfbd9a215 /src/test | |
| parent | 5fad3dc36b3aad7f2ea13e56d838c3eb37fb029d (diff) | |
| parent | 4645f28c3b125f9d281eb457d110c431a6a0b166 (diff) | |
| download | tor-6330d2d9e6dc8cdeceea9486ad96e57487d6d232.tar.gz tor-6330d2d9e6dc8cdeceea9486ad96e57487d6d232.zip | |
Merge remote-tracking branch 'public/bug6227' into maint-0.2.3
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/test_util.c b/src/test/test_util.c index d2d0a55520..632ef68bd6 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1186,7 +1186,7 @@ test_util_threads(void) #ifndef _WIN32 struct timeval tv; tv.tv_sec=0; - tv.tv_usec=10; + tv.tv_usec=100*1000; #endif #ifndef TOR_IS_MULTITHREADED /* Skip this test if we aren't threading. We should be threading most @@ -1213,7 +1213,7 @@ test_util_threads(void) if (strmap_get(_thread_test_strmap, "thread 1") && strmap_get(_thread_test_strmap, "thread 2")) { done = 1; - } else if (time(NULL) > started + 25) { + } else if (time(NULL) > started + 150) { timedout = done = 1; } tor_mutex_release(_thread_test_mutex); |