From patchwork Thu Sep 26 07:52:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Hu X-Patchwork-Id: 1167775 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 46f6bx6f6Kz9sNf; Thu, 26 Sep 2019 17:53:01 +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 1iDOaB-0002Bx-1F; Thu, 26 Sep 2019 07:52:59 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iDOa9-0002Bq-SR for fwts-devel@lists.ubuntu.com; Thu, 26 Sep 2019 07:52:57 +0000 Received: from 61-220-137-37.hinet-ip.hinet.net ([61.220.137.37] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iDOa9-0003C8-5d; Thu, 26 Sep 2019 07:52:57 +0000 From: Ivan Hu To: fwts-devel@lists.ubuntu.com Subject: [PATCH] fwtstest: boot-0001: sync with boot table check on efi firmware Date: Thu, 26 Sep 2019 15:52:52 +0800 Message-Id: <1569484372-3035-1-git-send-email-ivan.hu@canonical.com> X-Mailer: git-send-email 2.7.4 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: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" Signed-off-by: Ivan Hu Acked-by: Colin Ian King Acked-by: Alex Hung --- fwts-test/boot-0001/boot-0001-efi.log | 8 ++++++++ fwts-test/boot-0001/boot-0002-efi.log | 8 ++++++++ fwts-test/boot-0001/test-0001.sh | 9 ++++++++- fwts-test/boot-0001/test-0002.sh | 8 +++++++- 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 fwts-test/boot-0001/boot-0001-efi.log create mode 100644 fwts-test/boot-0001/boot-0002-efi.log diff --git a/fwts-test/boot-0001/boot-0001-efi.log b/fwts-test/boot-0001/boot-0001-efi.log new file mode 100644 index 0000000..6335af2 --- /dev/null +++ b/fwts-test/boot-0001/boot-0001-efi.log @@ -0,0 +1,8 @@ +boot boot: BOOT Table test. +boot ---------------------------------------------------------- +boot ACPI BOOT table is depreciated on UEFI firmware, skipping +boot test +boot ========================================================== +boot 0 passed, 0 failed, 0 warning, 0 aborted, 1 skipped, 0 +boot info only. +boot ========================================================== diff --git a/fwts-test/boot-0001/boot-0002-efi.log b/fwts-test/boot-0001/boot-0002-efi.log new file mode 100644 index 0000000..6335af2 --- /dev/null +++ b/fwts-test/boot-0001/boot-0002-efi.log @@ -0,0 +1,8 @@ +boot boot: BOOT Table test. +boot ---------------------------------------------------------- +boot ACPI BOOT table is depreciated on UEFI firmware, skipping +boot test +boot ========================================================== +boot 0 passed, 0 failed, 0 warning, 0 aborted, 1 skipped, 0 +boot info only. +boot ========================================================== diff --git a/fwts-test/boot-0001/test-0001.sh b/fwts-test/boot-0001/test-0001.sh index 6c0dc92..4395448 100755 --- a/fwts-test/boot-0001/test-0001.sh +++ b/fwts-test/boot-0001/test-0001.sh @@ -10,8 +10,15 @@ if [ $? -eq 1 ]; then exit 77 fi +if [ -d /sys/firmware/efi ]; then + FILE=boot-0001-efi.log +else + FILE=boot-0001.log +fi + + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/boot-0001/acpidump-0001.log boot - | cut -c7- | grep "^boot" > $TMPLOG -diff $TMPLOG $FWTSTESTDIR/boot-0001/boot-0001.log >> $FAILURE_LOG +diff $TMPLOG $FWTSTESTDIR/boot-0001/$FILE >> $FAILURE_LOG ret=$? if [ $ret -eq 0 ]; then echo PASSED: $TEST, $NAME diff --git a/fwts-test/boot-0001/test-0002.sh b/fwts-test/boot-0001/test-0002.sh index bd3e917..b5f91f2 100755 --- a/fwts-test/boot-0001/test-0002.sh +++ b/fwts-test/boot-0001/test-0002.sh @@ -10,8 +10,14 @@ if [ $? -eq 1 ]; then exit 77 fi +if [ -d /sys/firmware/efi ]; then + FILE=boot-0002-efi.log +else + FILE=boot-0002.log +fi + $FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/boot-0001/acpidump-0002.log boot - | cut -c7- | grep "^boot" > $TMPLOG -diff $TMPLOG $FWTSTESTDIR/boot-0001/boot-0002.log >> $FAILURE_LOG +diff $TMPLOG $FWTSTESTDIR/boot-0001/$FILE >> $FAILURE_LOG ret=$? if [ $ret -eq 0 ]; then echo PASSED: $TEST, $NAME