From: Mark Andrews <marka@isc.org>
Date: Mon, 29 Oct 2018 05:15:52 +0000 (+1100)
Subject: Initalize TZ environment variable before calling dns_test_begin in dnstap_test.
X-Git-Tag: v9.13.4~80^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cf12540515e4a3fc93ace02b81815209f1e709e;p=thirdparty%2Fbind9.git

Initalize TZ environment variable before calling dns_test_begin in dnstap_test.
---

diff --git a/CHANGES b/CHANGES
index f887d92dd4a..24b52236912 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
-5063.	[test]		In statschannel test try a few times before failing when
-			checking if the compressed output is the same as
+5064.	[test]		Initalize TZ environment variable before calling
+			dns_test_begin in dnstap_test. [GL #624]
+
+5063.	[test]		In statschannel test try a few times before failing
+			when checking if the compressed output is the same as
 			uncompressed. [GL !909]
 
 5062.	[func]		Use non-crypto-secure PRNG to generate nonces for
diff --git a/lib/dns/tests/dnstap_test.c b/lib/dns/tests/dnstap_test.c
index 96fe28a20f7..3da5117f797 100644
--- a/lib/dns/tests/dnstap_test.c
+++ b/lib/dns/tests/dnstap_test.c
@@ -297,6 +297,9 @@ ATF_TC_BODY(totext, tc) {
 
 	UNUSED(tc);
 
+	/* make sure text conversion gets the right local time */
+	setenv("TZ", "PST8", 1);
+
 	result = dns_test_begin(NULL, true);
 	ATF_REQUIRE(result == ISC_R_SUCCESS);
 
@@ -306,9 +309,6 @@ ATF_TC_BODY(totext, tc) {
 	result = isc_stdio_open(TAPTEXT, "r", &fp);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	/* make sure text conversion gets the right local time */
-	setenv("TZ", "PST8", 1);
-
 	while (dns_dt_getframe(handle, &data, &dsize) == ISC_R_SUCCESS) {
 		dns_dtdata_t *dtdata = NULL;
 		isc_buffer_t *b = NULL;