Commit 92c9d052 authored by Mark Andrews's avatar Mark Andrews

Merge branch '940-unit-dnstap-pkcs11-tz' into 'master'

Fix regression in dnstap_test with native pkcs11

Closes #940

See merge request !1688
parents e4b43612 788f7841
Pipeline #12080 passed with stages
in 55 seconds
5187. [test] Set time zone before running any tests in dnstap_test.
[GL #940]
5186. [cleanup] More dnssec-keygen manual tidying. [GL !1678]
5185. [placeholder]
......
......@@ -310,9 +310,6 @@ totext_test(void **state) {
UNUSED(state);
/* make sure text conversion gets the right local time */
setenv("TZ", "PST8", 1);
result = dns_dt_open(TAPSAVED, dns_dtmode_file, mctx, &handle);
assert_int_equal(result, ISC_R_SUCCESS);
......@@ -379,6 +376,9 @@ main(void) {
cmocka_unit_test_setup_teardown(totext_test, _setup, _teardown),
};
/* make sure text conversion gets the right local time */
setenv("TZ", "PST8", 1);
return (cmocka_run_group_tests(tests, NULL, NULL));
#else
print_message("1..0 # Skip dnstap not enabled\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment