@@ -20,7 +20,7 @@ static uint8_t addr;
static bool use_century;
/* input buffer must have at least 7 elements */
-static inline time_t rtc_parse(const uint8_t *buf)
+static inline time_t rtc_parse(const uint8_t *buf, unsigned *wday)
{
struct tm parts;
@@ -48,10 +48,14 @@ static inline time_t rtc_parse(const uint8_t *buf)
parts.tm_year += 100u;
}
+ if (wday) {
+ *wday = parts.tm_wday;
+ }
+
return mktimegm(&parts);
}
-static time_t rtc_gettime(void)
+static time_t rtc_gettime(unsigned *wday)
{
uint8_t buf[7];
@@ -61,7 +65,7 @@ static time_t rtc_gettime(void)
/* read back current time registers */
i2c_recv(i2c, addr, buf, 7);
- return rtc_parse(buf);
+ return rtc_parse(buf, wday);
}
#endif /* DSRTCCOMMON_H */
@@ -20,17 +20,24 @@
static
void test_rtc_current(void)
{
+ struct tm tm_actual;
time_t expected, actual;
/* relax test to limit false positives when host may be overloaded.
* Allow larger delta when running "-m quick"
*/
time_t max_delta = g_test_slow() ? 1 : 30;
+ unsigned wday_expect;
+
actual = time(NULL);
/* new second may start here */
- expected = rtc_gettime();
+ expected = rtc_gettime(&wday_expect);
+
+ gmtime_r(&actual, &tm_actual);
+
g_assert_cmpuint(expected, <=, actual + max_delta);
g_assert_cmpuint(expected, >=, actual);
+ g_assert_cmpuint(wday_expect, ==, tm_actual.tm_wday);
}
int main(int argc, char *argv[])
@@ -124,16 +124,18 @@ void test_rtc_set(const void *raw)
const uint8_t *testtime = raw;
time_t expected, actual;
+ unsigned wday_expect, wday_actual;
/* skip address pointer and parse remainder */
- expected = rtc_parse(&testtime[1]);
+ expected = rtc_parse(&testtime[1], &wday_expect);
i2c_send(i2c, addr, testtime, 8);
/* host may start new second here */
- actual = rtc_gettime();
+ actual = rtc_gettime(&wday_actual);
g_assert_cmpuint(expected, <=, actual);
g_assert_cmpuint(expected + max_delta, >=, actual);
+ g_assert_cmpuint(wday_expect, ==, wday_actual);
}
int main(int argc, char *argv[])
Signed-off-by: Michael Davidsaver <mdavidsaver@gmail.com> --- tests/ds-rtc-common.h | 10 +++++++--- tests/ds-rtc-current-test.c | 9 ++++++++- tests/ds-rtc-set-test.c | 6 ++++-- 3 files changed, 19 insertions(+), 6 deletions(-)