Fix regression in dnstap_test with native pkcs11
Change to cmocka broken initialization of TZ environment. This time, commit1cf1254051is not soon enough. Has to be moved more forward, before any other tests. It library is not full reinitialized on each test. (cherry picked from commit71c4fad592)
This commit is contained in:
committed by
Mark Andrews
parent
2dc5dbfeb2
commit
7885bbff99
@@ -312,9 +312,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);
|
||||
|
||||
@@ -381,6 +378,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");
|
||||
|
||||
Reference in New Issue
Block a user