Always teardown capture of logs in CAPTURE().

This will hopefully solve an issue where our gmtime related tests are
failing on 32-bit builds.
This commit is contained in:
Alexander Færøy 2021-08-16 15:27:38 +00:00
parent 78712990ab
commit 903c578119

View File

@ -819,17 +819,16 @@ test_util_time(void *arg)
/* The below tests will all cause a BUG message, so we capture, suppress, /* The below tests will all cause a BUG message, so we capture, suppress,
* and detect. */ * and detect. */
#define CAPTURE() do { \ #define CAPTURE() do { \
teardown_capture_of_logs(); \
setup_full_capture_of_logs(LOG_WARN); \ setup_full_capture_of_logs(LOG_WARN); \
} while (0) } while (0)
#define CHECK_TIMEGM_WARNING(msg) do { \ #define CHECK_TIMEGM_WARNING(msg) do { \
expect_single_log_msg_containing(msg); \ expect_single_log_msg_containing(msg); \
teardown_capture_of_logs(); \
} while (0) } while (0)
#define CHECK_POSSIBLE_EINVAL() do { \ #define CHECK_POSSIBLE_EINVAL() do { \
if (mock_saved_log_n_entries()) { \ if (mock_saved_log_n_entries()) { \
expect_single_log_msg_containing("Invalid argument"); \ expect_single_log_msg_containing("Invalid argument"); \
} \ } \
teardown_capture_of_logs(); \
} while (0) } while (0)
#define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \ #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \