From patchwork Sat Mar 24 19:24:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Davidsaver X-Patchwork-Id: 890517 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="O9RPUR0t"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 407rB84Drfz9s25 for ; Sun, 25 Mar 2018 06:31:28 +1100 (AEDT) Received: from localhost ([::1]:47303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezosw-0002u9-3u for incoming@patchwork.ozlabs.org; Sat, 24 Mar 2018 15:31:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42560) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezoo4-0007o3-QU for qemu-devel@nongnu.org; Sat, 24 Mar 2018 15:30:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ezon0-0005o8-Qk for qemu-devel@nongnu.org; Sat, 24 Mar 2018 15:26:24 -0400 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:35527) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ezon0-0005n9-Ky for qemu-devel@nongnu.org; Sat, 24 Mar 2018 15:25:18 -0400 Received: by mail-pl0-x242.google.com with SMTP id p9-v6so9440708pls.2 for ; Sat, 24 Mar 2018 12:25:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vDTp3oeug8/fXwEh2tmR+OPN22ajYk+8qT0bohkAij8=; b=O9RPUR0tJzpkCtajJgJL8aznn5mikBvJW6m6LNuzfS/CVKOynACXqE9y2Ql+9H9yeQ uKHAq/dBmVRb83Husgd3tsQEeQGaQY7pIikHB86Cvve5HJTOFq63zUL6AzpjC+XDe5ah /T2/U+wRlMXzKJ5I+88v2MuWPWf/L8hx5rjWea0djsn2blCm3+U/wHlcsbHBE4igHHxg NP+HFFXFM5VTRhuOidQ0anzTJ4b5VRCVAkqruYVG7x42XXrSxBMH3JJYMgFB2lxDVmS5 PGpURUZCgiSL/+Z0ZZ0y8Xp/BnhjRXXTocHv7sdtY9gNhov1EibcIbxywBdPaEsjkEqh ejww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vDTp3oeug8/fXwEh2tmR+OPN22ajYk+8qT0bohkAij8=; b=DPcukbnrzmJq1oZW9YdCy/RKUXwR5g2jp07kgLS866hggd1iISCa2Z4vV2XXpyg7FA 4bEOyaTJmQxO6oiJoKYHJO/0Ob+NhHW2Pt9qJeKvk9jhvD0LF7flag4L3UGD54/b+vau UcYd+2EF/grwCyPXHTDD4l85UKyQZP98EhUZBc4FKFDVswdiwE5+tHMNTk4lHAlU3BD8 b0pwPYqqb+/ZZFXhL92fBM84YspQkCF52uvklF1N9ZIi6yzQ1yGZTGC7DLjcpuF8vRZW RZ44aE2qCg3zXNEaDAO9zneq7k5lJnM+mAOqYPZ1rg2B2oMboATJo8673Rw6ltmc/nzN IG5A== X-Gm-Message-State: AElRT7FGplT/omCDgrlzxGWX4sm7FkCfphxOdO1o8ucnjhgIUIjhNR7A KUdqtCMJC+X40JQoXRJNZTI= X-Google-Smtp-Source: AG47ELt71QSZKlNp1XeMpR6WTM9Wf1SoCZ6Vu+Beo5315zo2vfL6doNjQlXd7NDi78JjMl9n/Dr5dQ== X-Received: by 2002:a17:902:2b84:: with SMTP id l4-v6mr16979759plb.65.1521919517728; Sat, 24 Mar 2018 12:25:17 -0700 (PDT) Received: from localhost.localdomain (c-73-158-53-43.hsd1.ca.comcast.net. [73.158.53.43]) by smtp.gmail.com with ESMTPSA id o2sm13353501pgq.87.2018.03.24.12.25.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Mar 2018 12:25:16 -0700 (PDT) From: Michael Davidsaver To: Peter Maydell , Thomas Huth Date: Sat, 24 Mar 2018 12:24:49 -0700 Message-Id: <20180324192455.12254-9-mdavidsaver@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180324192455.12254-1-mdavidsaver@gmail.com> References: <20180324192455.12254-1-mdavidsaver@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::242 Subject: [Qemu-devel] [PATCH 08/14] tests: ds-rtc test wday offset X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Antoine Mathys , Michael Davidsaver , qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Michael Davidsaver --- 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(-) diff --git a/tests/ds-rtc-common.h b/tests/ds-rtc-common.h index c8e6c2bc5b..633131c55f 100644 --- a/tests/ds-rtc-common.h +++ b/tests/ds-rtc-common.h @@ -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 */ diff --git a/tests/ds-rtc-current-test.c b/tests/ds-rtc-current-test.c index 6acbbed9a6..7dc3202261 100644 --- a/tests/ds-rtc-current-test.c +++ b/tests/ds-rtc-current-test.c @@ -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[]) diff --git a/tests/ds-rtc-set-test.c b/tests/ds-rtc-set-test.c index c48406ee2c..12aeb2580a 100644 --- a/tests/ds-rtc-set-test.c +++ b/tests/ds-rtc-set-test.c @@ -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[])