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

Merge branch 'maint-0.2.9' into release-0.2.9

This commit is contained in:
Nick Mathewson 2016-12-07 11:09:23 -05:00
parent 9b37d540b0 fce425e3ff
commit 78cb55e42f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/19974 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (unit tests):
- Fix tolerances in unit tests for monotonic time comparisons between
nanoseconds and microseconds. Previously, we accepted a 10 us
difference only, which is not realistic on every platform's
clock_gettime(). Fixes bug 19974; bugfix on 0.2.9.1-alpha.

4
src/test/test_util.c
View File

@ -5531,9 +5531,9 @@ test_util_monotonic_time(void *arg)
tt_u64_op(msecc1, OP_GE, nsecc1 / 1000000);
tt_u64_op(usecc1, OP_GE, nsecc1 / 1000);
tt_u64_op(msec1, OP_LE, nsec1 / 1000000 + 1);
tt_u64_op(usec1, OP_LE, nsec1 / 1000 +10);
tt_u64_op(usec1, OP_LE, nsec1 / 1000 + 1000);
tt_u64_op(msecc1, OP_LE, nsecc1 / 1000000 + 1);
tt_u64_op(usecc1, OP_LE, nsecc1 / 1000 + 10);
tt_u64_op(usecc1, OP_LE, nsecc1 / 1000 + 1000);
done:
;