[tor-commits] [tor/master] Fix gmtime unit test on openbsd

nickm at torproject.org nickm at torproject.org
Sun Sep 11 21:43:54 UTC 2016


commit ccea2a5aa92f3d6eae62877da8291a8c59d15adb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Sep 11 17:43:20 2016 -0400

    Fix gmtime unit test on openbsd
    
    openbsd helpfully handles gmtime() of INT64_MIN.  Good job!
    
    Our tests didn't handle that so well.
---
 src/test/test_util.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/test_util.c b/src/test/test_util.c
index cb523cf..7d02fed 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -881,7 +881,11 @@ test_util_time(void *arg)
            b_time.tm_year == (1-1900))) {
       tt_int_op(b_time.tm_year, OP_EQ, 1970-1900);
     }
-    CHECK_TIMEGM_WARNING("Rounding up to ");
+    if (b_time.tm_year != 1970-1900) {
+      CHECK_TIMEGM_WARNING("Rounding up to ");
+    } else {
+      teardown_capture_of_logs();
+    }
   }
 #endif
 



More information about the tor-commits mailing list