From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.56]) by mx.groups.io with SMTP id smtpd.web09.30781.1643626734823683676 for ; Mon, 31 Jan 2022 02:58:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=i1Ei9f0i; spf=pass (domain: arm.com, ip: 40.107.20.56, mailfrom: sunny.wang@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Rd09J3JmsJb27Gm/cLXGWedBGA480dcJ3moS+DwB/So=; b=i1Ei9f0iUhEDqZ/DH3ihx9B1Q8dD5ycvV7HWkucqDQv/kHezKOCpF3gOpZKMzqJETNGdB9RtGuTBciHkIaLFH1z/YLYQiFDnLqEGgVCycNxlwu1P09faqxqLe6nB+0g0teeUwF/DLDyNaQRkwMPcqADErP/3MUkv1Qj7Blx8DdM= Received: from DB9PR06CA0007.eurprd06.prod.outlook.com (2603:10a6:10:1db::12) by DB7PR08MB3035.eurprd08.prod.outlook.com (2603:10a6:5:1d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Mon, 31 Jan 2022 10:58:50 +0000 Received: from DB5EUR03FT039.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:1db:cafe::1d) by DB9PR06CA0007.outlook.office365.com (2603:10a6:10:1db::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15 via Frontend Transport; Mon, 31 Jan 2022 10:58:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT039.mail.protection.outlook.com (10.152.21.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15 via Frontend Transport; Mon, 31 Jan 2022 10:58:50 +0000 Received: ("Tessian outbound 2877e54fe176:v113"); Mon, 31 Jan 2022 10:58:49 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 4378c7de1395c3d6 X-CR-MTA-TID: 64aa7808 Received: from 4512fe6768da.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id FAD1B02F-5007-44FA-B66D-0D51E8802FFE.1; Mon, 31 Jan 2022 10:58:32 +0000 Received: from EUR03-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 4512fe6768da.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 31 Jan 2022 10:58:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nmA+a0DvKTtL9+5NcfgyfB+BqzyLnNALdmbkmJfJQ4ndiZQJhGqvD1XprWW4FJ1eN3oXNfsNBE+nzQUWUupZJxlXFqJu0phuI3rbV472FJHYVSTibo6ryS9a9/1Suk4yI4T0RFRuQ2PNaSUiiHEhlWgBisaRngpBHkDc3XKZCow3auA/Z0KLj7LiZIuPrH8DBscvlVmFeaQMMaEmkelTPsb03oLow5B4mFiUW2rFjTYeOSPt2JfRtdxhLomsed3hMJS/YDKPB/Pyk3ogkFLGOFLLEkvhb8oXhD+/Jx3KIAuimSiW45eqosGGorLGppqQA4hPj/3l1n91oxeBGbC69g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Rd09J3JmsJb27Gm/cLXGWedBGA480dcJ3moS+DwB/So=; b=C1iQ/76Ee1Q1pjhmCIXDE2mQUBUdxTTibMpfaaQX9tHBDc0i/QtaOGmRE86sKhT8XCb/ZK1XtKUXM9l0e1U8PIemYGK+3ppk6YjwnZ6jUDUc9wRnnZdVd+N2xMV9pl6tfq6zL/y5CUJVZ0EmejBMeK0dR/csy8iEW8Wl2ooIM/sr0qOISn5DAUmVwW2b3ysiFYKhg67M/IuA5sSAH1Cz8Tzgatz74hNv02Sck4Gbdj790/+r46gzA8l9ZG1v6sV1+SST6uCMslFoZb1vsQGbP4xqb2swbwiix9SrySx2m3KQ7hIPWPkL6tuYn+Y/HNVTxp6ohv82kFmnGE6vXFDXVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Rd09J3JmsJb27Gm/cLXGWedBGA480dcJ3moS+DwB/So=; b=i1Ei9f0iUhEDqZ/DH3ihx9B1Q8dD5ycvV7HWkucqDQv/kHezKOCpF3gOpZKMzqJETNGdB9RtGuTBciHkIaLFH1z/YLYQiFDnLqEGgVCycNxlwu1P09faqxqLe6nB+0g0teeUwF/DLDyNaQRkwMPcqADErP/3MUkv1Qj7Blx8DdM= Received: from DB8PR08MB3993.eurprd08.prod.outlook.com (2603:10a6:10:ad::26) by DB6PR08MB2789.eurprd08.prod.outlook.com (2603:10a6:6:20::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Mon, 31 Jan 2022 10:58:27 +0000 Received: from DB8PR08MB3993.eurprd08.prod.outlook.com ([fe80::6158:8322:4271:e623]) by DB8PR08MB3993.eurprd08.prod.outlook.com ([fe80::6158:8322:4271:e623%5]) with mapi id 15.20.4930.021; Mon, 31 Jan 2022 10:58:27 +0000 From: "Sunny Wang" To: "devel@edk2.groups.io" , Sunny Wang CC: G Edhaya Chandran , Barton Gao , Carolyn Gjertsen , Heinrich Schuchardt , Samer El-Haj-Mahmoud , Sunny Wang Subject: Re: [edk2-devel] [edk2-test][PATCH v1] uefi-sct/SctPkg: Allow SimpleTextOut SetMode to return EFI_UNSUPPORTED Thread-Topic: [edk2-devel] [edk2-test][PATCH v1] uefi-sct/SctPkg: Allow SimpleTextOut SetMode to return EFI_UNSUPPORTED Thread-Index: AQHYBzWzrGJE53nwSUivtQCIy7sk4qx9FA7A Date: Mon, 31 Jan 2022 10:58:27 +0000 Message-ID: References: <16C955E76B71968A.28404@groups.io> In-Reply-To: <16C955E76B71968A.28404@groups.io> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-MS-Office365-Filtering-Correlation-Id: 2d1b1921-0fa2-40a1-1a29-08d9e4a8a99a x-ms-traffictypediagnostic: DB6PR08MB2789:EE_|DB5EUR03FT039:EE_|DB7PR08MB3035:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true nodisclaimer: true x-ms-oob-tlc-oobclassifiers: OLM:9508;OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: hpNeoObe6chV6KCqusmynu5yw3H0BD1vYZHNBYBhwPIYQNXcxCrK9h/8j0hC+zvODfBOA+l2P796Qf7KVHHwKd5+jUEe5G220t0vUaUZVP27/Juxpt2TbfzEO0+GJYFqkgo4PYAZaNltX4Anf2EEMDw6I9Q8hVPoqjs/jSL/0Kb4p5etXmvmhXWwQ812YxKW7NCSkZP5JwZHWFMIclgBixEqgwDOfUFO4+tZP6ltZVh9Qo0lDluUbZbq8APpKJkzbbCj9QY78z4oOxeF20iNs6QhT365YdJa5r4/XFThPh/hI0qbYb5AdUr1KbA4+TC+fCMxs1qdFDzs5rK1YnKV0sA+WnHYRsQOFoQnqvg1kAT6+Nx2UOSsYzs8WSF+oI4R5N8H5vb0v3TLsONbHt3XQFo7mTAQ34ZpeNy4RNh1HYZwsLRpxVQLvyQxbuWNH1B0azM4HP9icuFC0w8MKllz6i6LzzF5lt+Hwa5ILFbEk5zpA3ZSFyrTg4+Pmg8bUWu/MxLd5PlL1H6B2olOEvHgc2JeJgYHAJLA7eK7m/5S3lPXvxW6XfjDpNnCe6sKi/Qas634qKzi+yDcihLEOXbdidxkuoIePJsaJZlTWhdUTe4gXhPOoBjiJ5zyT8spZx6QHX7ngypGCV2rqznuRJ9lQzxEjPEX7mjyhIZ32+ciQgbKXoXpiF/mgYr7FcQeXeqSrWHPNVUGkEhnohHuX2FdYfic+6fHCcu1F6ijcqvJl0wjQNyeuSLHargKj2wBIe0L94WMw0+VU1VkacfWOvY4SAuQrMIrhX3/zEcWjhn9SkygASrqJnO/jriHhjAVgamHe/dsHWRABe7wz3oegzDpGg== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB8PR08MB3993.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(53546011)(16799955002)(4326008)(316002)(7696005)(54906003)(6506007)(110136005)(9686003)(5660300002)(71200400001)(508600001)(966005)(26005)(186003)(83380400001)(2906002)(38100700002)(38070700005)(33656002)(122000001)(15188155005)(86362001)(55016003)(8676002)(64756008)(66446008)(8936002)(30864003)(52536014)(66476007)(76116006)(66556008)(66946007)(559001)(579004)(20210929001);DIR:OUT;SFP:1101; MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR08MB2789 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Return-Path: Sunny.Wang@arm.com X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT039.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 25ae5d58-5775-461f-692c-08d9e4a89c42 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QLgG58/wSm0UqKLqk4fT5Xi0+d11CF6WIXnnEBZ2j0sqN1edOS5KRhQRrCFVcj2HUW3mnESR4q4RT0M0rp/5z/X772zdaWHxDNsUyX782clp/7FDQpTAB4fMm33s2rEI/Pac0uFguq+aAzEoPZT3+XRI2BSd6RBmsZCfaN9B2teXsOCa9RFIbgWieoLD2LW3cIcHEXyAw5F/vGVzEDrP2AqIXKebtgrKZoAfWkYc2s1sfukwSZ+ArixzJwQjn06MXAl88H3tmQXeUuvzyuSSp8yKJMGcIONuSQmaa3B5qkD+Km7KIb4U/25Zmb+n5gW1bAi1A7J46oq78P4hERPRrU4LMRmRkzNvEAgZsD3yAkEqpAsDq97xSMciaqUkKHTaZ/P80O9dP4X6/Hdpy1dALRyapL3rh5C9+ETFySGYesHactwj5WKZuqDFdZI6f1CtBDpkLlqwiVDI6OUS99tAh85leuoIFrUW4ud5uBzE52hpWh8YxoZ9cZ5AXnk153T9xtrj5DLo9ao+cNSrxewZ0uswj/xS/ryOgFRsFo7azAF5Cb+seMOPConKQgEiwcO2jn1H3IgU4CkUuVS/WPW9lc2mffqmGgo/AzzGWcDAy0o4WpniTu+gP776D8lHA1OzHs1GrzXcXc+3NH3Z9r5Dc4iVbRLuKhb6pT9mZ3M9Ued7IxjxglZMU+3H4HYgSEw1LOOvLz9iaFRJ5Yx8AKaKxYVpe7NbMmXx8+hzjBMmI3dEw75eQQ6RQTqsTBYr3/qFpOleRzlyiUjGyBNpE/DRH5asQ/5g9NphlZUEkCVfROnEGGSNteEDoLRUSODQL/g2wk3cY9OwZ7vRWYEr4n3g7g== X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(46966006)(40470700004)(16799955002)(8676002)(4326008)(8936002)(55016003)(508600001)(2906002)(356005)(81166007)(316002)(54906003)(110136005)(966005)(6506007)(7696005)(53546011)(9686003)(33656002)(86362001)(26005)(82310400004)(15188155005)(40460700003)(336012)(186003)(52536014)(5660300002)(30864003)(70586007)(70206006)(36860700001)(47076005)(83380400001)(2690400003)(559001)(579004)(20210929001);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2022 10:58:50.0566 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2d1b1921-0fa2-40a1-1a29-08d9e4a8a99a X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT039.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR08MB3035 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable I'm just aware that it is difficult to review this patch as it includes whi= te space changes (Trimming the trailing space and transferring TABs to spac= es) for edk2 coding-standard compliance. Therefore, please use the link below that hides white spaces changes to rev= iew the changes. Thanks for Edhaya's offline reminder! https://github.com/sunnywang-arm/edk2-test/pull/1/files?diff=3Dunified&w=3D= 1 Best Regards, Sunny -----Original Message----- From: devel@edk2.groups.io On Behalf Of Sunny Wang v= ia groups.io Sent: 11 January 2022 21:53 To: devel@edk2.groups.io Cc: Sunny Wang ; G Edhaya Chandran ; Barton Gao ; Carolyn Gjertsen ; Heinrich Schuchardt ; Samer= El-Haj-Mahmoud ; Sunny Wang Subject: [edk2-devel] [edk2-test][PATCH v1] uefi-sct/SctPkg: Allow SimpleTe= xtOut SetMode to return EFI_UNSUPPORTED REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3738 The SimpleTestOut test cases don't allow SetMode to return EFI_UNSUPPORTED, which doesn't comply with UEFI spec. UEFI spec allows EFI_SIMPLE_TEXT_OUT_PROTOCOL.SetMode function to return EFI_UNSUPPORTED for the condition below: if the output devices support 80x50, that is defined to be mode 1. All other text dimensions supported by the device will follow as modes 2 and above. If an output device supports modes 2 and above, but does not support 80x50, then querying for mode 1 will return EFI_UNSUPPORTED. Therefore, update the test cases to fix this issue. Cc: G Edhaya Chandran Cc: Barton Gao Cc: Carolyn Gjertsen Cc: Heinrich Schuchardt Cc: Samer El-Haj-Mahmoud Signed-off-by: Sunny Wang --- .../SimpleTextOutBBTestConformance_efi.c | 13 +- .../SimpleTextOutBBTestConformance_uefi.c | 15 +- .../SimpleTextOutBBTestFunction_efi.c | 46 +- .../SimpleTextOutBBTestFunction_uefi.c | 349 +++++---- .../SimpleTextOutBBTestConformance_uefi.c | 15 +- .../SimpleTextOutBBTestFunction_uefi.c | 715 +++++++++--------- 6 files changed, 623 insertions(+), 530 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/Black= BoxTest/SimpleTextOutBBTestConformance_efi.c b/uefi-sct/SctPkg/TestCase/UEF= I/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestConformance_ef= i.c index 8b8c3f86..d3861e3c 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest= /SimpleTextOutBBTestConformance_efi.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest= /SimpleTextOutBBTestConformance_efi.c @@ -2,15 +2,16 @@ Copyright 2006 - 2016 Unified EFI, Inc.
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2022, ARM Limited. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php - + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. - + **/ /*++ @@ -761,7 +762,11 @@ BBTestSetCursorPositionConformanceAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/Black= BoxTest/SimpleTextOutBBTestConformance_uefi.c b/uefi-sct/SctPkg/TestCase/UE= FI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestConformance_u= efi.c index 99e14d7b..555f78e7 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest= /SimpleTextOutBBTestConformance_uefi.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest= /SimpleTextOutBBTestConformance_uefi.c @@ -2,15 +2,16 @@ Copyright 2006 - 2016 Unified EFI, Inc.
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2022, ARM Limited. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php - + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. - + **/ /*++ @@ -82,7 +83,7 @@ BBTestQueryModeConformanceAutoTest ( ); return Status; } - + SimpleOut =3D (EFI_SIMPLE_TEXT_OUT_PROTOCOL *)ClientInterface; // @@ -759,7 +760,11 @@ BBTestSetCursorPositionConformanceAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/Black= BoxTest/SimpleTextOutBBTestFunction_efi.c b/uefi-sct/SctPkg/TestCase/UEFI/E= FI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_efi.c index c370ea91..375e73df 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest= /SimpleTextOutBBTestFunction_efi.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest= /SimpleTextOutBBTestFunction_efi.c @@ -2,15 +2,16 @@ Copyright 2006 - 2016 Unified EFI, Inc.
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2022, ARM Limited. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php - + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. - + **/ /*++ @@ -647,7 +648,11 @@ BBTestResetFunctionAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, @@ -3150,7 +3155,11 @@ BBTestSetModeFunctionManualTest ( // Return status check // if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } } else { AssertionType =3D EFI_TEST_ASSERTION_PASSED; } @@ -3177,7 +3186,6 @@ BBTestSetModeFunctionManualTest ( } else { AssertionType =3D EFI_TEST_ASSERTION_PASSED; } - StandardLib->RecordAssertion ( StandardLib, AssertionType, @@ -3989,7 +3997,11 @@ BBTestSetAttributeFunctionAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, @@ -4547,7 +4559,11 @@ BBTestClearScreenFunctionAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, @@ -5062,7 +5078,11 @@ BBTestSetCursorPositionFunctionAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, @@ -5155,7 +5175,7 @@ BBTestSetCursorPositionFunctionAutoTest ( BackupMode (SimpleOut, &ModeExpected); // - // Set cursor position to (IndexRow * IndexColumn) + // Set cursor position to (IndexRow * IndexColumn) // Status =3D SimpleOut->SetCursorPosition (SimpleOut, IndexColumn, I= ndexRow); @@ -5818,7 +5838,11 @@ BBTestEnableCursorFunctionAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/Black= BoxTest/SimpleTextOutBBTestFunction_uefi.c b/uefi-sct/SctPkg/TestCase/UEFI/= EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_uefi.c index a833498c..aeee04c2 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest= /SimpleTextOutBBTestFunction_uefi.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest= /SimpleTextOutBBTestFunction_uefi.c @@ -2,15 +2,16 @@ Copyright 2006 - 2016 Unified EFI, Inc.
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2022, ARM Limited. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php - + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. - + **/ /*++ @@ -50,7 +51,7 @@ BBTestResetFunctionManualTest ( EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib; EFI_STATUS Status; EFI_SIMPLE_TEXT_OUT_PROTOCOL *SimpleOut; - + EFI_TEST_ASSERTION AssertionType; EFI_SIMPLE_TEXT_OUTPUT_MODE ModeOrg, ModeExpected; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; @@ -146,7 +147,7 @@ BBTestResetFunctionManualTest ( // SctPrint (L"\n\rVGA Reset without extended verification start...\n\r"); WaitTimeOrKey (5); - + // // Prepare expected Mode after call Reset. // @@ -272,12 +273,12 @@ BBTestResetFunctionManualTest ( L" Expected:Cursor Position(%d x %d), MaxMode=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.MaxMode + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.MaxMode ); // @@ -455,7 +456,11 @@ BBTestResetFunctionAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, @@ -582,12 +587,12 @@ BBTestResetFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), MaxMode=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.MaxMode + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.MaxMode ); // @@ -987,18 +992,18 @@ BBTestOutputStringFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -1217,18 +1222,18 @@ BBTestOutputStringFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -1626,18 +1631,18 @@ BBTestOutputStringFunctionManualTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -1897,18 +1902,18 @@ BBTestOutputStringFunctionManualTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -2433,18 +2438,18 @@ BBTestQueryModeFunctionAutoTest ( __FILE__, (UINTN)__LINE__, Index, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); if ( EFI_UNSUPPORTED =3D=3D Status && 1 =3D=3D Index ) { @@ -2738,7 +2743,11 @@ BBTestSetModeFunctionManualTest ( // Return status check // if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } } else { AssertionType =3D EFI_TEST_ASSERTION_PASSED; } @@ -2968,18 +2977,18 @@ BBTestSetModeFunctionAutoTest ( __FILE__, (UINTN)__LINE__, Index, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -3003,7 +3012,7 @@ BBTestSetModeFunctionAutoTest ( ); } - + Status =3D RestoreMode (SimpleOut, &ModeOrg, StandardLib); if (EFI_ERROR(Status)) { StandardLib->RecordAssertion ( @@ -3152,17 +3161,17 @@ BBTestSetAttributeFunctionManualTest ( for (IndexFore =3D 0; IndexFore < 16; IndexFore++) { Attribute =3D EFI_TEXT_ATTR(IndexFore, IndexBack); - + BackupMode (SimpleOut, &ModeExpected); ModeExpected.Attribute =3D (INT32)Attribute; - + Status =3D SimpleOut->SetAttribute (SimpleOut, Attribute); - + // // Wait for some time to change next background color // gtBS->Stall (100000); - + if (EFI_ERROR(Status)) { AssertionType =3D EFI_TEST_ASSERTION_FAILED; StandardLib->RecordAssertion ( @@ -3206,7 +3215,7 @@ BBTestSetAttributeFunctionManualTest ( (UINTN)ModeExpected.Attribute, (UINTN)ModeExpected.CursorVisible ); - Result =3D FALSE; + Result =3D FALSE; } } } @@ -3388,7 +3397,11 @@ BBTestSetAttributeFunctionAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, @@ -3434,7 +3447,7 @@ BBTestSetAttributeFunctionAutoTest ( Status, Attribute ); - Result =3D FALSE; + Result =3D FALSE; } if (EFI_ERROR(Status)) { continue; @@ -3464,12 +3477,12 @@ BBTestSetAttributeFunctionAutoTest ( (UINTN)ModeExpected.Attribute, (UINTN)ModeExpected.CursorVisible ); - Result =3D FALSE; + Result =3D FALSE; } } } - if ( Result =3D=3D TRUE ) { + if ( Result =3D=3D TRUE ) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; StandardLib->RecordAssertion ( StandardLib, @@ -3629,7 +3642,7 @@ BBTestClearScreenFunctionManualTest ( // BackupMode (SimpleOut, &ModeExpected); ModeExpected.CursorRow =3D 0; - ModeExpected.CursorColumn =3D 0; + ModeExpected.CursorColumn =3D 0; // // Clear screen with current background color @@ -3846,7 +3859,11 @@ BBTestClearScreenFunctionAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, @@ -3896,18 +3913,18 @@ BBTestClearScreenFunctionAutoTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -3929,7 +3946,7 @@ BBTestClearScreenFunctionAutoTest ( Status ); } - + Status =3D RestoreMode (SimpleOut, &ModeOrg, StandardLib); if (EFI_ERROR(Status)) { StandardLib->RecordAssertion ( @@ -4158,7 +4175,7 @@ BBTestSetCursorPositionFunctionManualTest ( ); Result =3D FALSE; } - + // // Returned status check // @@ -4177,7 +4194,7 @@ BBTestSetCursorPositionFunctionManualTest ( IndexRow ); Result =3D FALSE; - } + } // // Wait for a little time // @@ -4362,7 +4379,11 @@ BBTestSetCursorPositionFunctionAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, @@ -4414,7 +4435,7 @@ BBTestSetCursorPositionFunctionAutoTest ( BackupMode (SimpleOut, &ModeExpected); // - // Set cursor position to (IndexRow * IndexColumn) + // Set cursor position to (IndexRow * IndexColumn) // Status =3D SimpleOut->SetCursorPosition (SimpleOut, IndexColumn, I= ndexRow); @@ -4447,7 +4468,7 @@ BBTestSetCursorPositionFunctionAutoTest ( (UINTN)ModeExpected.Attribute, (UINTN)ModeExpected.CursorVisible ); - Result =3D FALSE; + Result =3D FALSE; } // @@ -4467,7 +4488,7 @@ BBTestSetCursorPositionFunctionAutoTest ( IndexColumn, IndexRow ); - Result =3D FALSE; + Result =3D FALSE; } } } @@ -4501,7 +4522,7 @@ BBTestSetCursorPositionFunctionAutoTest ( Status ); } - + return Status; } @@ -4739,18 +4760,18 @@ BBTestEnableCursorFunctionManualTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); } else { // @@ -4888,18 +4909,18 @@ BBTestEnableCursorFunctionManualTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); } else { // @@ -4931,7 +4952,7 @@ BBTestEnableCursorFunctionManualTest ( Status ); } - + return Status; } @@ -5058,7 +5079,11 @@ BBTestEnableCursorFunctionAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, @@ -5212,18 +5237,18 @@ BBTestEnableCursorFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMod= e=3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); @@ -5254,6 +5279,6 @@ BBTestEnableCursorFunctionAutoTest ( Status ); } - + return Status; } diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextOut/Black= BoxTest/SimpleTextOutBBTestConformance_uefi.c b/uefi-sct/SctPkg/TestCase/UE= FI/IHV/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestConformance_u= efi.c index 99e14d7b..555f78e7 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextOut/BlackBoxTest= /SimpleTextOutBBTestConformance_uefi.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextOut/BlackBoxTest= /SimpleTextOutBBTestConformance_uefi.c @@ -2,15 +2,16 @@ Copyright 2006 - 2016 Unified EFI, Inc.
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2022, ARM Limited. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php - + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. - + **/ /*++ @@ -82,7 +83,7 @@ BBTestQueryModeConformanceAutoTest ( ); return Status; } - + SimpleOut =3D (EFI_SIMPLE_TEXT_OUT_PROTOCOL *)ClientInterface; // @@ -759,7 +760,11 @@ BBTestSetCursorPositionConformanceAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextOut/Black= BoxTest/SimpleTextOutBBTestFunction_uefi.c b/uefi-sct/SctPkg/TestCase/UEFI/= IHV/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_uefi.c index 93fd5d75..b27722c4 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextOut/BlackBoxTest= /SimpleTextOutBBTestFunction_uefi.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextOut/BlackBoxTest= /SimpleTextOutBBTestFunction_uefi.c @@ -2,15 +2,16 @@ Copyright 2006 - 2016 Unified EFI, Inc.
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2022, ARM Limited. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php - + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. - + **/ /*++ @@ -50,7 +51,7 @@ BBTestResetFunctionManualTest ( EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib; EFI_STATUS Status; EFI_SIMPLE_TEXT_OUT_PROTOCOL *SimpleOut; - + EFI_TEST_ASSERTION AssertionType; EFI_SIMPLE_TEXT_OUTPUT_MODE ModeOrg, ModeExpected; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; @@ -146,7 +147,7 @@ BBTestResetFunctionManualTest ( // SctPrint (L"\n\rVGA Reset without extended verification start...\n\r"); WaitTimeOrKey (5); - + // // Prepare expected Mode after call Reset. // @@ -176,12 +177,12 @@ BBTestResetFunctionManualTest ( L" Expected:Cursor Position(%d x %d), MaxMode=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.MaxMode + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.MaxMode ); // @@ -272,12 +273,12 @@ BBTestResetFunctionManualTest ( L" Expected:Cursor Position(%d x %d), MaxMode=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.MaxMode + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.MaxMode ); // @@ -455,7 +456,11 @@ BBTestResetFunctionAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, @@ -505,12 +510,12 @@ BBTestResetFunctionAutoTest ( L"Expected:Cursor Position(%d x %d), MaxMode=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.MaxMode + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.MaxMode ); // @@ -582,12 +587,12 @@ BBTestResetFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), MaxMode=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.MaxMode + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.MaxMode ); // @@ -850,18 +855,18 @@ BBTestOutputStringFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -987,18 +992,18 @@ BBTestOutputStringFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -1094,18 +1099,18 @@ BBTestOutputStringFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -1217,18 +1222,18 @@ BBTestOutputStringFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -1469,18 +1474,18 @@ BBTestOutputStringFunctionManualTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -1626,18 +1631,18 @@ BBTestOutputStringFunctionManualTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -1754,18 +1759,18 @@ BBTestOutputStringFunctionManualTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -1897,18 +1902,18 @@ BBTestOutputStringFunctionManualTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -2240,18 +2245,18 @@ BBTestTestStringFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -2433,18 +2438,18 @@ BBTestQueryModeFunctionAutoTest ( __FILE__, (UINTN)__LINE__, Index, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); if ( EFI_UNSUPPORTED =3D=3D Status && 1 =3D=3D Index ) { @@ -2720,25 +2725,29 @@ BBTestSetModeFunctionManualTest ( __FILE__, (UINTN)__LINE__, Index, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // // Return status check // if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } } else { AssertionType =3D EFI_TEST_ASSERTION_PASSED; } @@ -2968,25 +2977,29 @@ BBTestSetModeFunctionAutoTest ( __FILE__, (UINTN)__LINE__, Index, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // // Return status check // if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } } else { AssertionType =3D EFI_TEST_ASSERTION_PASSED; } @@ -3003,7 +3016,7 @@ BBTestSetModeFunctionAutoTest ( ); } - + Status =3D RestoreMode (SimpleOut, &ModeOrg, StandardLib); if (EFI_ERROR(Status)) { StandardLib->RecordAssertion ( @@ -3152,17 +3165,17 @@ BBTestSetAttributeFunctionManualTest ( for (IndexFore =3D 0; IndexFore < 16; IndexFore++) { Attribute =3D EFI_TEXT_ATTR(IndexFore, IndexBack); - + BackupMode (SimpleOut, &ModeExpected); ModeExpected.Attribute =3D (INT32)Attribute; - + Status =3D SimpleOut->SetAttribute (SimpleOut, Attribute); - + // // Wait for some time to change next background color // gtBS->Stall (100000); - + if (EFI_ERROR(Status)) { AssertionType =3D EFI_TEST_ASSERTION_FAILED; StandardLib->RecordAssertion ( @@ -3193,20 +3206,20 @@ BBTestSetAttributeFunctionManualTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, Ma= xMode=3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); - Result =3D FALSE; + Result =3D FALSE; } } } @@ -3388,7 +3401,11 @@ BBTestSetAttributeFunctionAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, @@ -3434,7 +3451,7 @@ BBTestSetAttributeFunctionAutoTest ( Status, Attribute ); - Result =3D FALSE; + Result =3D FALSE; } if (EFI_ERROR(Status)) { continue; @@ -3451,25 +3468,25 @@ BBTestSetAttributeFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, = MaxMode=3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); - Result =3D FALSE; + Result =3D FALSE; } } } - if ( Result =3D=3D TRUE ) { + if ( Result =3D=3D TRUE ) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; StandardLib->RecordAssertion ( StandardLib, @@ -3629,7 +3646,7 @@ BBTestClearScreenFunctionManualTest ( // BackupMode (SimpleOut, &ModeExpected); ModeExpected.CursorRow =3D 0; - ModeExpected.CursorColumn =3D 0; + ModeExpected.CursorColumn =3D 0; // // Clear screen with current background color @@ -3653,18 +3670,18 @@ BBTestClearScreenFunctionManualTest ( L" Expected: Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -3846,7 +3863,11 @@ BBTestClearScreenFunctionAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, @@ -3896,18 +3917,18 @@ BBTestClearScreenFunctionAutoTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -3929,7 +3950,7 @@ BBTestClearScreenFunctionAutoTest ( Status ); } - + Status =3D RestoreMode (SimpleOut, &ModeOrg, StandardLib); if (EFI_ERROR(Status)) { StandardLib->RecordAssertion ( @@ -4143,22 +4164,22 @@ BBTestSetCursorPositionFunctionManualTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, Max= Mode=3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); Result =3D FALSE; } - + // // Returned status check // @@ -4177,7 +4198,7 @@ BBTestSetCursorPositionFunctionManualTest ( IndexRow ); Result =3D FALSE; - } + } // // Wait for a little time // @@ -4362,7 +4383,11 @@ BBTestSetCursorPositionFunctionAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, @@ -4414,7 +4439,7 @@ BBTestSetCursorPositionFunctionAutoTest ( BackupMode (SimpleOut, &ModeExpected); // - // Set cursor position to (IndexRow * IndexColumn) + // Set cursor position to (IndexRow * IndexColumn) // Status =3D SimpleOut->SetCursorPosition (SimpleOut, IndexColumn, I= ndexRow); @@ -4434,20 +4459,20 @@ BBTestSetCursorPositionFunctionAutoTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, M= axMode=3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); - Result =3D FALSE; + Result =3D FALSE; } // @@ -4467,7 +4492,7 @@ BBTestSetCursorPositionFunctionAutoTest ( IndexColumn, IndexRow ); - Result =3D FALSE; + Result =3D FALSE; } } } @@ -4501,7 +4526,7 @@ BBTestSetCursorPositionFunctionAutoTest ( Status ); } - + return Status; } @@ -4669,18 +4694,18 @@ BBTestEnableCursorFunctionManualTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -4739,18 +4764,18 @@ BBTestEnableCursorFunctionManualTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); } else { // @@ -4803,18 +4828,18 @@ BBTestEnableCursorFunctionManualTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -4888,18 +4913,18 @@ BBTestEnableCursorFunctionManualTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); } else { // @@ -4931,7 +4956,7 @@ BBTestEnableCursorFunctionManualTest ( Status ); } - + return Status; } @@ -5058,7 +5083,11 @@ BBTestEnableCursorFunctionAutoTest ( // Status =3D SimpleOut->SetMode (SimpleOut, Mode); if (EFI_ERROR(Status)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; + if (EFI_UNSUPPORTED =3D=3D Status) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } StandardLib->RecordAssertion ( StandardLib, AssertionType, @@ -5128,18 +5157,18 @@ BBTestEnableCursorFunctionAutoTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -5212,18 +5241,18 @@ BBTestEnableCursorFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMod= e=3D%d, Attribute=3D%d, CursorVisible=3D%d.", __FILE__, (UINTN)__LINE__, - (UINTN)SimpleOut->Mode->CursorColumn, - (UINTN)SimpleOut->Mode->CursorRow, - (UINTN)SimpleOut->Mode->Mode, - (UINTN)SimpleOut->Mode->MaxMode, - (UINTN)SimpleOut->Mode->Attribute, - (UINTN)SimpleOut->Mode->CursorVisible, - (UINTN)ModeExpected.CursorColumn, - (UINTN)ModeExpected.CursorRow, - (UINTN)ModeExpected.Mode, - (UINTN)ModeExpected.MaxMode, - (UINTN)ModeExpected.Attribute, - (UINTN)ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); @@ -5254,6 +5283,6 @@ BBTestEnableCursorFunctionAutoTest ( Status ); } - + return Status; } -- 2.32.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D Groups.io Links: You receive all messages sent to this group. View/Reply Online (#85576): https://edk2.groups.io/g/devel/message/85576 Mute This Topic: https://groups.io/mt/88360183/5985097 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [Sunny.Wang@arm.com] -=3D-=3D-=3D-=3D-=3D-=3D IMPORTANT NOTICE: The contents of this email and any attachments are confid= ential and may also be privileged. If you are not the intended recipient, p= lease notify the sender immediately and do not disclose the contents to any= other person, use it for any purpose, or store or copy the information in = any medium. Thank you.