Merge "time.mktime_EOVERFLOW: set an explicit timezone." am: c044d3afeb am: 1c05dd7170 am: 12937903dd am: b97155767a am: dfa7827ecd

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2597441

Change-Id: I07ec76a260aeb39b4b7559713fd701050697d1e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index d16600c..f89fa9a 100644
--- a/tests/time_test.cpp
+++ b/tests/time_test.cpp
@@ -168,6 +168,8 @@
 }
 
 TEST(time, mktime_EOVERFLOW) {
+  setenv("TZ", "UTC", 1);
+
   struct tm t;
   memset(&t, 0, sizeof(tm));