tor

commit 16041d791873dc063a625e09fb62206d8ab2e6f4
parent 3d45079c27b94f073442f80b203f9787857c2d01
Author: George Kadianakis <desnacked@riseup.net>
Date:   Tue,  9 Apr 2019 12:25:18 +0300

Merge branch 'maint-0.4.0'

Diffstat:
A
changes/bug29922
 | 
4
++++
M
src/test/test_util.c
 | 
9
+++++++++

2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/changes/bug29922 b/changes/bug29922
@@ -0,0 +1,4 @@
+  o Minor bugfixes (testing, windows):
+    - Fix a test failure caused by an unexpected bug warning in
+      our test for tor_gmtime_r(-1). Fixes bug 29922;
+      bugfix on 0.2.9.3-alpha.
diff --git a/src/test/test_util.c b/src/test/test_util.c
@@ -728,6 +728,13 @@ test_util_time(void *arg)
 
 #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \
     CHECK_TIMEGM_WARNING("Out-of-range argument to tor_timegm")
+#define CHECK_POSSIBLE_TIMEGM_ARG_OUT_OF_RANGE(msg)             \
+  do {                                                          \
+    if (mock_saved_log_n_entries()) {                           \
+      expect_single_log_msg_containing("Out-of-range argument");\
+    }                                                           \
+    teardown_capture_of_logs();                                 \
+  } while (0)
 
   /* year */
 
@@ -914,7 +921,9 @@ test_util_time(void *arg)
    * depending on whether the implementation of the system gmtime(_r)
    * sets struct tm (1) or not (1970) */
   t_res = -1;
+  CAPTURE();
   tor_gmtime_r(&t_res, &b_time);
+  CHECK_POSSIBLE_TIMEGM_ARG_OUT_OF_RANGE();
   tt_assert(b_time.tm_year == (1970-1900) ||
             b_time.tm_year == (1969-1900));