diff options
| author | Simon Glass <[email protected]> | 2022-08-01 07:58:46 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-09-02 16:21:44 -0400 |
| commit | c4d7247a389ae2770ddcdada5143401068a696c0 (patch) | |
| tree | 39c5bc98b3a4dfbd36e0f0fb0e935d0d91c9c7b2 /test | |
| parent | ea94d053e19ee3341301cf999a8dd78e37b83cca (diff) | |
dm: rtc: Avoid a race in the rtc_reset test
Since resetting the RTC on sandbox causes it to read the base time from
the system, we cannot rely on this being unchanged since it was last read.
Allow for a one-second delay.
Reviewed-by: Heinrich Schuchardt <[email protected]>
Fixes: https://source.denx.de/u-boot/u-boot/-/issues/4
Reported-by: Bin Meng <[email protected]>
Reported-by: Tom Rini <[email protected]>
Suggested-by: Rasmus Villemoes <[email protected]>
Signed-off-by: Simon Glass <[email protected]>
Diffstat (limited to 'test')
| -rw-r--r-- | test/dm/rtc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/dm/rtc.c b/test/dm/rtc.c index a8349756c18..e23905b3e2e 100644 --- a/test/dm/rtc.c +++ b/test/dm/rtc.c @@ -251,10 +251,15 @@ static int dm_test_rtc_reset(struct unit_test_state *uts) ut_asserteq(0, sandbox_i2c_rtc_get_set_base_time(emul, -1)); - /* Resetting the RTC should put he base time back to normal */ + /* + * Resetting the RTC should put the base time back to normal. Allow for + * a one-second adjustment in case the time flips over while this + * test process is pre-empted, since reset_time() in i2c_rtc_emul.c + * reads the time from the OS. + */ ut_assertok(dm_rtc_reset(dev)); base_time = sandbox_i2c_rtc_get_set_base_time(emul, -1); - ut_asserteq(old_base_time, base_time); + ut_assert(base_time - old_base_time <= 1); return 0; } |