Commit 78382d55 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'dgoulet/bug25113_029_01'

parents 86498e5a fe3dfe7e

changes/bug25113

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (unit test, monotonic time):

    - Bump a gap of 1msec to 10msec used in the monotonic time test that makes

      sure the nsec/usec/msec time read are synchronized. This change was

      needed to accommodate slow system like armel or when the clock_gettime()

      is not a VDSO on the running kernel. Fixes bug 25113; bugfix on 0.2.9.1.

src/test/test_util.c

+4 −4
Original line number Diff line number Diff line
@@ -5838,10 +5838,10 @@ test_util_monotonic_time(void *arg) 
  tt_u64_op(usec1, OP_GE, nsec1 / 1000);

  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 + 1000);

  tt_u64_op(msecc1, OP_LE, nsecc1 / 1000000 + 1);

  tt_u64_op(usecc1, OP_LE, nsecc1 / 1000 + 1000);

  tt_u64_op(msec1, OP_LE, nsec1 / 1000000 + 10);

  tt_u64_op(usec1, OP_LE, nsec1 / 1000 + 10000);

  tt_u64_op(msecc1, OP_LE, nsecc1 / 1000000 + 10);

  tt_u64_op(usecc1, OP_LE, nsecc1 / 1000 + 10000);



  uint64_t coarse_stamp_diff =

    monotime_coarse_stamp_units_to_approx_msec(stamp2-stamp1);