< prev index next >
test/native/logging/test_logDecorations.cpp
Print this page
rev 11906 : 8164939: GTest LogDecorations.iso8601_time_test fails on macOS
*** 142,152 ****
reported_time.tm_mon = M - 1;
reported_time.tm_mday = d;
reported_time.tm_hour = h;
reported_time.tm_min = m;
reported_time.tm_sec = s;
! reported_time.tm_isdst = daylight;
time_t reported_ts = mktime(&reported_time);
expected_ts = mktime(localtime(&expected_ts));
time_t diff = reported_ts - expected_ts;
if (diff < 0) {
diff = -diff;
--- 142,152 ----
reported_time.tm_mon = M - 1;
reported_time.tm_mday = d;
reported_time.tm_hour = h;
reported_time.tm_min = m;
reported_time.tm_sec = s;
! reported_time.tm_isdst = -1; // let mktime deduce DST settings
time_t reported_ts = mktime(&reported_time);
expected_ts = mktime(localtime(&expected_ts));
time_t diff = reported_ts - expected_ts;
if (diff < 0) {
diff = -diff;
< prev index next >