From patchwork Fri Jul 30 06:24:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunny Wang X-Patchwork-Id: 1511521 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Gbcp64Cc3z9sT6 for ; Fri, 30 Jul 2021 16:25:17 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1m9LxH-0000G9-E0; Fri, 30 Jul 2021 06:25:11 +0000 Received: from foss.arm.com ([217.140.110.172]) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1m9LxF-0000G0-KF for fwts-devel@lists.ubuntu.com; Fri, 30 Jul 2021 06:25:09 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E9A9B31B; Thu, 29 Jul 2021 23:25:08 -0700 (PDT) Received: from localhost.localdomain (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 24B513F66F; Thu, 29 Jul 2021 23:25:06 -0700 (PDT) From: Sunny Wang To: fwts-devel@lists.ubuntu.com Subject: [PATCH 1/1] uefirttime: Fix incorrect error messages for invalid time test Date: Fri, 30 Jul 2021 14:24:29 +0800 Message-Id: <20210730062429.1133-1-Sunny.Wang@arm.com> X-Mailer: git-send-email 2.31.0.windows.1 MIME-Version: 1.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: samer.el-haj-mahmoud@arm.com, edhaya.chandran@arm.com Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" uefirttime_test_settime_invalid_time() gets and sets time rather than wakeup time, but the error message shows that it gets and sets wakeup time, which is incorrect. Note that the incorrect error message would cause fake failure in Test Failure Summary. Signed-off-by: Sunny Wang Acked-by: Colin Ian King Acked-by: Ivan Hu --- src/uefi/uefirttime/uefirttime.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/uefi/uefirttime/uefirttime.c b/src/uefi/uefirttime/uefirttime.c index 786f29a2..d2c2f91d 100644 --- a/src/uefi/uefirttime/uefirttime.c +++ b/src/uefi/uefirttime/uefirttime.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2012-2021 Canonical + * Copyright (c) 2021, ARM Limited. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -513,7 +514,7 @@ static int uefirttime_test_settime_invalid_time( return FWTS_SKIP; } fwts_failed(fw, LOG_LEVEL_HIGH, "UEFIRuntimeGetTime", - "Failed to get wakeup time with UEFI runtime service."); + "Failed to get time with UEFI runtime service."); fwts_uefi_print_status_info(fw, status); return FWTS_ERROR; } @@ -556,7 +557,7 @@ static int uefirttime_test_settime_invalid_time( return FWTS_SKIP; } fwts_failed(fw, LOG_LEVEL_HIGH, "UEFIRuntimeSetTime", - "Failed to set wakeup time with UEFI runtime service."); + "Failed to set time with UEFI runtime service."); fwts_uefi_print_status_info(fw, status); return FWTS_ERROR; }