commit 345aa1e90386009650c1bca618ed4d66079cbd0d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 12 22:47:30 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 12 22:47:30 2024 +0000
tree 17ba2452d90c92d3fc14c89dca02808e5a265689
parent f5146642e100da75fbdb349a383f5c9a90c0cd3c
parent c400c439e35ffbc24946716b34199e90cda0b466

Merge changes from topic "am-1324cc5267bd42bf80b925722de582b5" into main

* changes:
  Merge "[RESTRICT AUTOMERGE] time_test#mktime_EOVERFLOW: allow both Android 14 and 2024Q1 behavior." into android14-tests-dev am: c2a27bd25a
  [RESTRICT AUTOMERGE] time_test#mktime_EOVERFLOW: allow both Android 14 and 2024Q1 behavior. am: 4c5eeb8346

tests/time_test.cpp

diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index ca8e260..7c96964 100644
--- a/tests/time_test.cpp
+++ b/tests/time_test.cpp
@@ -168,7 +168,7 @@
 #endif
 }
 
-TEST(time, mktime_EOVERFLOW) {
+TEST(time, DISABLED_mktime_EOVERFLOW) {
   setenv("TZ", "UTC", 1);
 
   struct tm t;