From b6b3e89231a623441940889b5badd90f74bdce2b Mon Sep 17 00:00:00 2001
From: Frank Tang <ftang@chromium.org>
Date: Mon, 18 Sep 2023 20:20:42 -0700
Subject: [PATCH] ICU-22512 Fix broken TestHebrewCalendarInTemporalLeapYear

Fix broken test mistakenly landed in
https://github.com/unicode-org/icu/pull/2274

Some important steps were missed in the last landing.
---
 icu4c/source/test/intltest/caltest.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/icu4c/source/test/intltest/caltest.cpp b/icu4c/source/test/intltest/caltest.cpp
index 9d89f468eef0..18b96f231ba3 100644
--- a/source/test/intltest/caltest.cpp
+++ b/source/test/intltest/caltest.cpp
@@ -4028,6 +4028,7 @@ void CalendarTest::TestHebrewCalendarInTemporalLeapYear() {
     for (gc.set(startYear, UCAL_JANUARY, 1);
          gc.get(UCAL_YEAR, status) <= stopYear;
          gc.add(UCAL_DATE, incrementDays, status)) {
+        cal->setTime(gc.getTime(status), status);
         if (failure(status, "add/get/set/getTime/setTime incorrect")) return;
 
         int32_t cal_year = cal->get(UCAL_EXTENDED_YEAR, status);
@@ -4036,6 +4037,7 @@ void CalendarTest::TestHebrewCalendarInTemporalLeapYear() {
             leapTest->set(UCAL_MONTH, 0);
             leapTest->set(UCAL_DATE, 1);
             // If 10 months after TISHRI is TAMUZ, then it is a leap year.
+            leapTest->add(UCAL_MONTH, 10, status);
             hasLeapMonth = leapTest->get(UCAL_MONTH, status) == icu::HebrewCalendar::TAMUZ;
             yearForHasLeapMonth = cal_year;
         }
ethod='get' action='/guix/log/gnu/packages/suckless.scm'>
<input type='hidden' name='id' value='1984701773a537a12198d98c4ec2d8001cc1905b'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=1984701773a537a12198d98c4ec2d8001cc1905b'>root</a>/<a href='/guix/log/gnu?id=1984701773a537a12198d98c4ec2d8001cc1905b'>gnu</a>/<a href='/guix/log/gnu/packages?id=1984701773a537a12198d98c4ec2d8001cc1905b'>packages</a>/<a href='/guix/log/gnu/packages/suckless.scm?id=1984701773a537a12198d98c4ec2d8001cc1905b'>suckless.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/suckless.scm?id=1984701773a537a12198d98c4ec2d8001cc1905b&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
pan title='2024-01-09 22:10:10 -0500'>2024-01-09</span></td><td><a href='/guix/commit/gnu/packages/logging.scm?id=45d07a0b01c30d18a537c47efce79192b8c8d178'>gnu: catch2-3: Update to 3.5.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/check.scm (catch2-3.3): Rename to...
(catch2-3): ... this.  Update to 3.5.1.
* gnu/packages/logging.scm (spdlog) [native-inputs]: Rename catch2-3.3 to
catch2-3.
* gnu/packages/potassco.scm (clingo) [inputs]: Likewise.

Change-Id: Ied7724597ff4c6371dc4fedc10452ae870d23933
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2023-09-17 15:31:04 +0200'>2023-09-17</span></td><td><a href='/guix/commit/gnu/packages/logging.scm?id=c69dc48da684c338fb8fc991a5d95a238df7573a'>gnu: spdlog: Update to 1.12.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/logging.scm (spdlog): Update to 1.12.0.
[native-inputs]: Add catch2-3.3.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Greg Hogan</td></tr>
<tr><td><span title='2023-08-27 19:16:45 +0100'>2023-08-27</span></td><td><a href='/guix/commit/gnu/packages/logging.scm?id=1ae56be99e124da33390573084bc56a01ce1dba8'>gnu: spdlog: Fix tests.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/patches/spdlog-fix-tests.patch: New file.
* gnu/local.mk: Add it.
* gnu/packages/logging.scm (spdlog)[source]: Use patch.

Signed-off-by: Christopher Baines &lt;mail@cbaines.net&gt;
</span></span></td><td>Greg Hogan</td></tr>