From: Li Wang <liwang@redhat.com>
To: ltp@lists.linux.it
Cc: Eirik Fuller <efuller@redhat.com>
Subject: [LTP] [PATCH 3/3] rtc02: loosen the compare precision with few seconds
Date: Thu, 28 Apr 2022 21:26:56 +0800 [thread overview]
Message-ID: <20220428132656.11075-4-liwang@redhat.com> (raw)
In-Reply-To: <20220428132656.11075-1-liwang@redhat.com>
That possibly has time elapse between twice operations, especially
on VM we can't guarantee the time precisely equal, let's lose a few
seconds to make the test happy:
tst_test.c:1433: TINFO: Timeout per run is 0h 10m 00s
rtc02.c:66: TINFO: To set RTC date/time is: 2020-10-09 13:23:30
rtc02.c:80: TINFO: read RTC date/time is: 2020-10-09 13:23:31
rtc02.c:83: TFAIL: RTC SET TEST
Signed-off-by: Li Wang <liwang@redhat.com>
Cc: Eirik Fuller <efuller@redhat.com>
---
testcases/kernel/device-drivers/rtc/rtc02.c | 46 +++++++++++++++++++--
1 file changed, 42 insertions(+), 4 deletions(-)
diff --git a/testcases/kernel/device-drivers/rtc/rtc02.c b/testcases/kernel/device-drivers/rtc/rtc02.c
index 6198a5d5d..a008971d5 100644
--- a/testcases/kernel/device-drivers/rtc/rtc02.c
+++ b/testcases/kernel/device-drivers/rtc/rtc02.c
@@ -41,10 +41,48 @@ static char *rtctime_to_str(struct rtc_time *tm)
static int rtc_tm_cmp(struct rtc_time *set_tm, struct rtc_time *read_tm)
{
- return !((set_tm->tm_sec == read_tm->tm_sec)
- && (set_tm->tm_min == read_tm->tm_min)
- && (set_tm->tm_hour == read_tm->tm_hour)
- && (set_tm->tm_mday == read_tm->tm_mday)
+ int delta = read_tm->tm_sec - set_tm->tm_sec;
+
+ /*
+ * To handle the normal and special situations:
+ * 1#
+ * set_tm: 2022-04-28 13:00:50
+ * read_tm: 2022-04-28 13:00:50
+ * 2#
+ * set_tm: 2022-04-28 13:00:50
+ * read_tm: 2022-04-28 13:00:51
+ * 3#
+ * set_tm: 2022-04-28 13:00:59
+ * read_tm: 2022-04-28 13:01:00
+ * 4#
+ * set_tm: 2022-04-28 13:59:59
+ * read_tm: 2022-04-28 14:00:00
+ *
+ * Note: as we have avoided testing around the zero
+ * clock, so it's impossible to hit situation 5#
+ * set_tm: 2022-04-28 23:59:59
+ * read_tm: 2022-04-29 00:00:00
+ */
+
+ /* 1~3 */
+ if (set_tm->tm_hour == read_tm->tm_hour) {
+ if (set_tm->tm_min == read_tm->tm_min - 1)
+ delta += 60;
+ else if (set_tm->tm_min != read_tm->tm_min)
+ return 1;
+ }
+
+ /* 4 */
+ if ((set_tm->tm_hour == read_tm->tm_hour - 1) &&
+ (set_tm->tm_min == read_tm->tm_min + 59))
+ delta += 60;
+ else if ((set_tm->tm_hour != read_tm->tm_hour))
+ return 1;
+
+ if (delta < 0 || delta > 3)
+ return 1;
+
+ return !((set_tm->tm_mday == read_tm->tm_mday)
&& (set_tm->tm_mon == read_tm->tm_mon)
&& (set_tm->tm_year == read_tm->tm_year));
}
--
2.35.1
--
Mailing list info: https://lists.linux.it/listinfo/ltp
next prev parent reply other threads:[~2022-04-28 13:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-28 13:26 [LTP] [PATCH 0/3] fix some bugs in rct02 Li Wang
2022-04-28 13:26 ` [LTP] [PATCH 1/3] rtc02: skip test with unsupport set RTC platform Li Wang
2022-04-29 11:07 ` Cyril Hrubis
2022-04-29 11:12 ` Li Wang
2022-04-28 13:26 ` [LTP] [PATCH 2/3] rtc02: reset backward 1 hour to RTC time Li Wang
2022-04-29 11:09 ` Cyril Hrubis
2022-04-28 13:26 ` Li Wang [this message]
2022-05-05 14:05 ` [LTP] [PATCH 3/3] rtc02: loosen the compare precision with few seconds Cyril Hrubis
2022-05-08 2:22 ` Li Wang
2022-05-08 3:05 ` [LTP] [PATCH v2] " Li Wang
2022-05-08 4:19 ` Li Wang
2022-05-10 14:08 ` Cyril Hrubis
2022-05-11 1:54 ` Li Wang
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=20220428132656.11075-4-liwang@redhat.com \
--to=liwang@redhat.com \
--cc=efuller@redhat.com \
--cc=ltp@lists.linux.it \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.