torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.3'

Browse Source
This commit is contained in:
Nick Mathewson
2012-06-26 11:04:43 -04:00
parent 05dd0a9cd9 6330d2d9e6
commit 86197dfd4f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug6227
+3
View File
@@ -0,0 +1,3 @@
o Minor bugfixes (unit tests):
- Avoid a false positive in the util/threads unit test by increasing
the maximum timeout time. Fixes bug 6227; bugfix on 0.2.0.4-alpha.
src/test/test_util.c
+2 -2
View File
@@ -1186,7 +1186,7 @@ test_util_threads(void)
#ifndef _WIN32 #ifndef _WIN32
struct timeval tv; struct timeval tv;
tv.tv_sec=0; tv.tv_sec=0;
tv.tv_usec=10; tv.tv_usec=100*1000;
#endif #endif
#ifndef TOR_IS_MULTITHREADED #ifndef TOR_IS_MULTITHREADED
/* Skip this test if we aren't threading. We should be threading most /* 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") && if (strmap_get(_thread_test_strmap, "thread 1") &&
strmap_get(_thread_test_strmap, "thread 2")) { strmap_get(_thread_test_strmap, "thread 2")) {
done = 1; done = 1;
} else if (time(NULL) > started + 25) { } else if (time(NULL) > started + 150) {
timedout = done = 1; timedout = done = 1;
} }
tor_mutex_release(_thread_test_mutex); tor_mutex_release(_thread_test_mutex);