From: amergnat@baylibre.com
To: Alexandre Belloni <alexandre.belloni@bootlin.com>,
Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: "Uwe Kleine-König" <u.kleine-koenig@baylibre.com>,
linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org,
"Alexandre Mergnat" <amergnat@baylibre.com>
Subject: [PATCH v4 4/5] rtc: test: Also test time and wday outcome of rtc_time64_to_tm()
Date: Mon, 28 Apr 2025 12:06:50 +0200 [thread overview]
Message-ID: <20250428-enable-rtc-v4-4-2b2f7e3f9349@baylibre.com> (raw)
In-Reply-To: <20250428-enable-rtc-v4-0-2b2f7e3f9349@baylibre.com>
From: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
To cover calculation of the time and wday in the rtc kunit test also check
tm_hour, tm_min, tm_sec and tm_wday of the rtc_time calculated by
rtc_time64_to_tm().
There are no surprises, the two tests making use of
rtc_time64_to_tm_test_date_range() continue to succeed.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Signed-off-by: Alexandre Mergnat <amergnat@baylibre.com>
---
drivers/rtc/lib_test.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/drivers/rtc/lib_test.c b/drivers/rtc/lib_test.c
index c0faddc04c9bbcd421cbdc030c4a073056c6a9a6..b1ac0701d42e5562b8eae5b191012c8b56a06902 100644
--- a/drivers/rtc/lib_test.c
+++ b/drivers/rtc/lib_test.c
@@ -6,8 +6,10 @@
/*
* Advance a date by one day.
*/
-static void advance_date(int *year, int *month, int *mday, int *yday)
+static void advance_date(int *year, int *month, int *mday, int *yday, int *wday)
{
+ *wday = (*wday + 1) % 7;
+
if (*mday != rtc_month_days(*month - 1, *year)) {
++*mday;
++*yday;
@@ -43,23 +45,29 @@ static void rtc_time64_to_tm_test_date_range(struct kunit *test, int years)
int month = 1;
int mday = 1;
int yday = 1;
+ int wday = 4; /* Jan 1st 1970 was a Thursday */
struct rtc_time result;
time64_t secs;
+ const time64_t sec_offset = ((1 * 60) + 2) * 60 + 3;
for (secs = 0; secs <= total_secs; secs += 86400) {
- rtc_time64_to_tm(secs, &result);
+ rtc_time64_to_tm(secs + sec_offset, &result);
- #define FAIL_MSG "%d/%02d/%02d (%2d) : %lld", \
- year, month, mday, yday, secs
+ #define FAIL_MSG "%d/%02d/%02d (%2d, %d) : %lld", \
+ year, month, mday, yday, wday, secs + sec_offset
KUNIT_ASSERT_EQ_MSG(test, year - 1900, result.tm_year, FAIL_MSG);
KUNIT_ASSERT_EQ_MSG(test, month - 1, result.tm_mon, FAIL_MSG);
KUNIT_ASSERT_EQ_MSG(test, mday, result.tm_mday, FAIL_MSG);
KUNIT_ASSERT_EQ_MSG(test, yday, result.tm_yday, FAIL_MSG);
+ KUNIT_ASSERT_EQ_MSG(test, 1, result.tm_hour, FAIL_MSG);
+ KUNIT_ASSERT_EQ_MSG(test, 2, result.tm_min, FAIL_MSG);
+ KUNIT_ASSERT_EQ_MSG(test, 3, result.tm_sec, FAIL_MSG);
+ KUNIT_ASSERT_EQ_MSG(test, wday, result.tm_wday, FAIL_MSG);
- advance_date(&year, &month, &mday, &yday);
+ advance_date(&year, &month, &mday, &yday, &wday);
}
}
--
2.25.1
next prev parent reply other threads:[~2025-04-28 10:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-28 10:06 [PATCH v4 0/5] Fix pre-1970 date handling Alexandre Mergnat
2025-04-28 10:06 ` [PATCH v4 1/5] rtc: Make rtc_time64_to_tm() support dates before 1970 Alexandre Mergnat
2025-04-28 16:59 ` Uwe Kleine-König
2025-05-06 7:58 ` Uwe Kleine-König
2025-05-28 10:33 ` Uwe Kleine-König
2025-04-28 10:06 ` [PATCH v4 2/5] rtc: Fix offset calculation for .start_secs < 0 Alexandre Mergnat
2025-04-28 17:00 ` Uwe Kleine-König
2025-04-28 10:06 ` [PATCH v4 3/5] rtc: test: Emit the seconds-since-1970 value instead of days-since-1970 amergnat
2025-04-28 10:06 ` amergnat [this message]
2025-04-28 10:06 ` [PATCH v4 5/5] rtc: test: Test date conversion for dates starting in 1900 amergnat
2025-04-28 10:55 ` [PATCH v4 0/5] Fix pre-1970 date handling Alexandre Mergnat
2025-06-01 22:14 ` Alexandre Belloni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250428-enable-rtc-v4-4-2b2f7e3f9349@baylibre.com \
--to=amergnat@baylibre.com \
--cc=alexandre.belloni@bootlin.com \
--cc=baolin.wang@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=u.kleine-koenig@baylibre.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).