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;
         }
/td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/task-management.scm'>
<input type='hidden' name='id' value='a1dc5ac832a106d46450961e78e7db3f83bf2bff'/><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=a1dc5ac832a106d46450961e78e7db3f83bf2bff'>root</a>/<a href='/guix/log/gnu?id=a1dc5ac832a106d46450961e78e7db3f83bf2bff'>gnu</a>/<a href='/guix/log/gnu/packages?id=a1dc5ac832a106d46450961e78e7db3f83bf2bff'>packages</a>/<a href='/guix/log/gnu/packages/task-management.scm?id=a1dc5ac832a106d46450961e78e7db3f83bf2bff'>task-management.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/task-management.scm?id=a1dc5ac832a106d46450961e78e7db3f83bf2bff&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-08-31 10:42:39 +0200'>2024-08-31</span></td><td><a href='/guix/commit/gnu/packages/task-management.scm?id=177228ccae5b7184a7550d7490c6009718f50e9c'>gnu: blanket: Add 'bash' input for 'wrap-program'.</a><span class='msg-avail'>...<span class='msg-tooltip'>It is required for cross-compilation.

* gnu/packages/task-management.scm
(blanket): Delete trailing #t.
[native-inputs]: Remove labels.
[inputs]: Add 'bash-minimal'.

Signed-off-by: Maxim Cournoyer &lt;maxim.cournoyer@gmail.com&gt;
Modified-by: Maxim Cournoyer &lt;maxim.cournoyer@gmail.com&gt;
Change-Id: I8d3458d16fd4ead7735b3e4b12b8bd0a12459fb0
</span></span></td><td>Maxime Devos</td></tr>
<tr><td><span title='2024-08-27 00:33:33 +0100'>2024-08-27</span></td><td><a href='/guix/commit/gnu/packages/task-management.scm?id=dd81dcecde26120853dfc93e26af3b852aa44313'>gnu: Add watson.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/task-management.scm (watson): New variable.

Signed-off-by: Sharlatan Hellseher &lt;sharlatanus@gmail.com&gt;
Change-Id: Ifc7671e6ec805e9e20e9f0c863c205a2848d4d61
</span></span></td><td>Sebastian Gibb</td></tr>
<tr><td><span title='2024-06-29 09:37:40 +0100'>2024-06-29</span></td><td><a href='/guix/commit/gnu/packages/task-management.scm?id=9cfcc16c2f42cf62656e1da23bc43cee03787b43'>gnu: dstask: Apply "-trimpath" flag.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/task-management.scm (dstask) [arguments]: &lt;#:phases&gt;:
Apply "-trimpath" flag to custom 'build phase.

Change-Id: I71b145cc4cae587fa898d479e1d5580b5f3750da
</span></span></td><td>Sharlatan Hellseher</td></tr>
<tr><td><span title='2024-03-24 11:48:53 +0100'>2024-03-24</span></td><td><a href='/guix/commit/gnu/packages/task-management.scm?id=f367047e9574ca8dd30ae8dc36ab1e783e2af71b'>gnu: todoman: Fix tests.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/task-management.scm (todoman) [#:phases] &lt;check&gt;: Load the `ci'
hypothesis profile provided by upstream.

Change-Id: I2ea01f8c424a50cd617303f8338f92563e7b0204
Signed-off-by: Liliana Marie Prikler &lt;liliana.prikler@gmail.com&gt;
</span></span></td><td>Vivien Kraus</td></tr>
<tr><td><span title='2024-03-24 11:48:53 +0100'>2024-03-24</span></td><td><a href='/guix/commit/gnu/packages/task-management.scm?id=51f59e24266271c058eeb03ce600b534f07f9dcc'>gnu: todoman: Update style.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/task-management.scm (todoman) [arguments]: Convert to list of G-Expressions.

Change-Id: I63faadabb27fa2053e3e01c3e285176bc040c634
Signed-off-by: Liliana Marie Prikler &lt;liliana.prikler@gmail.com&gt;
</span></span></td><td>Vivien Kraus</td></tr>
<tr><td><span title='2023-09-10 02:00:00 +0200'>2023-09-10</span></td><td><a href='/guix/commit/gnu/packages/task-management.scm?id=655686a2bdb8f5880f1239e8a8267442f73363c0'>gnu: dstask: Update to 0.26.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/task-management.scm (dstask): Update to 0.26.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>