From nobody Sat Apr 20 00:50:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+85576+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+85576+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1641937992; cv=none; d=zohomail.com; s=zohoarc; b=XD+ox0L840OEXDP6jPY2ToAdDSU0GqiOc1e7k+d1kxULzAUFJ/Rr2QsODrqN12t3tOBR/26/fRx8bWQK8a9CQaX+wHxnuP1SPx5w83w/Ao58jfwpvdwpWFp21/doPXbDrAnLe+sl9ZJg1kaLf5GE3BakOYx8nCTfX/7obonMRBw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641937992; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=BgmSqKljtw9r7h0mQX3xv8A/SsdrnvqctBtqKBfQD8A=; b=JL7jBnqnvGAXF9HNsNWEyeCTV1eaZYYU736y21ztHI3kqo6ZMC3h8lexeB/IgxWlMM5c4JQzZebJo+dNYAbX8sEWV5mMmgT3ZAMm7MQwz3Rx7zL8MWZrBQpBibZbDJZXbVipLXXzh19/UMx8Gc4/evgznsuE2UDNweKu1msdYhQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+85576+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1641937992311885.8085776043963; Tue, 11 Jan 2022 13:53:12 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id MJtyYY1788612x3fPH4MyDDB; Tue, 11 Jan 2022 13:53:11 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.14669.1641937990829235929 for ; Tue, 11 Jan 2022 13:53:11 -0800 X-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 7599AD6E; Tue, 11 Jan 2022 13:53:10 -0800 (PST) X-Received: from localhost.localdomain (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B31F03F774; Tue, 11 Jan 2022 13:53:08 -0800 (PST) From: "Sunny Wang" 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 SimpleTextOut SetMode to return EFI_UNSUPPORTED Date: Tue, 11 Jan 2022 21:52:40 +0000 Message-Id: <20220111215240.1726-1-Sunny.Wang@arm.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,Sunny.Wang@arm.com X-Gm-Message-State: TQFsC4O41RnJkbYu6PIljJNkx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641937991; bh=3XwyikK61V2zuBd4Ufa3iWe1IAoM1aknoDVvZyP0xrM=; h=Cc:Date:From:Reply-To:Subject:To; b=JWppH6ziQRejU1z8niS+wwiBhwXBf06Y4axHxR9Cq9ii8P32UbMPywmfGz/b5EbSzDO i573zZwpKsBW5aZukbuXjx/b23bzBU/SBHL+1Oeog8NJtfspx861FbFz3G5E8Clc9MaRj 65ItNaVPciogXonJVmmDNBcbpLtnruNTDBg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641937994308100002 Content-Type: text/plain; charset="utf-8" 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 @@ =20 Copyright 2006 - 2016 Unified EFI, Inc.
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2022, ARM Limited. All rights reserved.
=20 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=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + 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. -=20 + **/ /*++ =20 @@ -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 @@ =20 Copyright 2006 - 2016 Unified EFI, Inc.
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2022, ARM Limited. All rights reserved.
=20 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=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + 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. -=20 + **/ /*++ =20 @@ -82,7 +83,7 @@ BBTestQueryModeConformanceAutoTest ( ); return Status; } - =20 + SimpleOut =3D (EFI_SIMPLE_TEXT_OUT_PROTOCOL *)ClientInterface; =20 // @@ -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 @@ =20 Copyright 2006 - 2016 Unified EFI, Inc.
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2022, ARM Limited. All rights reserved.
=20 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=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + 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. -=20 + **/ /*++ =20 @@ -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); =20 // - // Set cursor position to (IndexRow * IndexColumn) + // Set cursor position to (IndexRow * IndexColumn) // Status =3D SimpleOut->SetCursorPosition (SimpleOut, IndexColumn, I= ndexRow); =20 @@ -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 @@ =20 Copyright 2006 - 2016 Unified EFI, Inc.
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2022, ARM Limited. All rights reserved.
=20 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=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + 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. -=20 + **/ /*++ =20 @@ -50,7 +51,7 @@ BBTestResetFunctionManualTest ( EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib; EFI_STATUS Status; EFI_SIMPLE_TEXT_OUT_PROTOCOL *SimpleOut; - =20 + 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); - =20 + // // 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 ); =20 // @@ -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 ); =20 // @@ -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 ); =20 // @@ -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 ); =20 // @@ -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 ); =20 // @@ -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 ); =20 // @@ -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 ); =20 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 ); =20 // @@ -3003,7 +3012,7 @@ BBTestSetModeFunctionAutoTest ( ); =20 } - =20 + Status =3D RestoreMode (SimpleOut, &ModeOrg, StandardLib); if (EFI_ERROR(Status)) { StandardLib->RecordAssertion ( @@ -3152,17 +3161,17 @@ BBTestSetAttributeFunctionManualTest ( for (IndexFore =3D 0; IndexFore < 16; IndexFore++) { =20 Attribute =3D EFI_TEXT_ATTR(IndexFore, IndexBack); - =20 + BackupMode (SimpleOut, &ModeExpected); ModeExpected.Attribute =3D (INT32)Attribute; - =20 + Status =3D SimpleOut->SetAttribute (SimpleOut, Attribute); - =20 + // // Wait for some time to change next background color // gtBS->Stall (100000); - =20 + 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; =09 + 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; } } } =20 - 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; =20 + ModeExpected.CursorColumn =3D 0; =20 // // 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 ); =20 // @@ -3929,7 +3946,7 @@ BBTestClearScreenFunctionAutoTest ( Status ); } - =20 + Status =3D RestoreMode (SimpleOut, &ModeOrg, StandardLib); if (EFI_ERROR(Status)) { StandardLib->RecordAssertion ( @@ -4158,7 +4175,7 @@ BBTestSetCursorPositionFunctionManualTest ( ); Result =3D FALSE; } - =20 + // // Returned status check // @@ -4177,7 +4194,7 @@ BBTestSetCursorPositionFunctionManualTest ( IndexRow ); Result =3D FALSE; - }=20 + } // // 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); =20 // - // Set cursor position to (IndexRow * IndexColumn) + // Set cursor position to (IndexRow * IndexColumn) // Status =3D SimpleOut->SetCursorPosition (SimpleOut, IndexColumn, I= ndexRow); =20 @@ -4447,7 +4468,7 @@ BBTestSetCursorPositionFunctionAutoTest ( (UINTN)ModeExpected.Attribute, (UINTN)ModeExpected.CursorVisible ); - Result =3D FALSE; + Result =3D FALSE; } =20 // @@ -4467,7 +4488,7 @@ BBTestSetCursorPositionFunctionAutoTest ( IndexColumn, IndexRow ); - Result =3D FALSE; + Result =3D FALSE; } } } @@ -4501,7 +4522,7 @@ BBTestSetCursorPositionFunctionAutoTest ( Status ); } - =20 + return Status; } =20 @@ -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 ); } - =20 + return Status; } =20 @@ -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 ); =20 =20 @@ -5254,6 +5279,6 @@ BBTestEnableCursorFunctionAutoTest ( Status ); } - =20 + 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 @@ =20 Copyright 2006 - 2016 Unified EFI, Inc.
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2022, ARM Limited. All rights reserved.
=20 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=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + 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. -=20 + **/ /*++ =20 @@ -82,7 +83,7 @@ BBTestQueryModeConformanceAutoTest ( ); return Status; } - =20 + SimpleOut =3D (EFI_SIMPLE_TEXT_OUT_PROTOCOL *)ClientInterface; =20 // @@ -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 @@ =20 Copyright 2006 - 2016 Unified EFI, Inc.
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2022, ARM Limited. All rights reserved.
=20 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=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + 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. -=20 + **/ /*++ =20 @@ -50,7 +51,7 @@ BBTestResetFunctionManualTest ( EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib; EFI_STATUS Status; EFI_SIMPLE_TEXT_OUT_PROTOCOL *SimpleOut; - =20 + 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); - =20 + // // 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 ); =20 // @@ -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 ); =20 // @@ -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 ); =20 // @@ -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 ); =20 // @@ -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 ); =20 // @@ -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 ); =20 // @@ -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 ); =20 // @@ -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 ); =20 // @@ -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 ); =20 // @@ -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 ); =20 // @@ -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 ); =20 // @@ -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 ); =20 // @@ -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 ); =20 // @@ -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 ); =20 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 ); =20 // // 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 ); =20 // // 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 ( ); =20 } - =20 + Status =3D RestoreMode (SimpleOut, &ModeOrg, StandardLib); if (EFI_ERROR(Status)) { StandardLib->RecordAssertion ( @@ -3152,17 +3165,17 @@ BBTestSetAttributeFunctionManualTest ( for (IndexFore =3D 0; IndexFore < 16; IndexFore++) { =20 Attribute =3D EFI_TEXT_ATTR(IndexFore, IndexBack); - =20 + BackupMode (SimpleOut, &ModeExpected); ModeExpected.Attribute =3D (INT32)Attribute; - =20 + Status =3D SimpleOut->SetAttribute (SimpleOut, Attribute); - =20 + // // Wait for some time to change next background color // gtBS->Stall (100000); - =20 + 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; =09 + 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; } } } =20 - 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; =20 + ModeExpected.CursorColumn =3D 0; =20 // // 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 ); =20 // @@ -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 ); =20 // @@ -3929,7 +3950,7 @@ BBTestClearScreenFunctionAutoTest ( Status ); } - =20 + 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; } - =20 + // // Returned status check // @@ -4177,7 +4198,7 @@ BBTestSetCursorPositionFunctionManualTest ( IndexRow ); Result =3D FALSE; - }=20 + } // // 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); =20 // - // Set cursor position to (IndexRow * IndexColumn) + // Set cursor position to (IndexRow * IndexColumn) // Status =3D SimpleOut->SetCursorPosition (SimpleOut, IndexColumn, I= ndexRow); =20 @@ -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; } =20 // @@ -4467,7 +4492,7 @@ BBTestSetCursorPositionFunctionAutoTest ( IndexColumn, IndexRow ); - Result =3D FALSE; + Result =3D FALSE; } } } @@ -4501,7 +4526,7 @@ BBTestSetCursorPositionFunctionAutoTest ( Status ); } - =20 + return Status; } =20 @@ -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 ); =20 // @@ -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 ); =20 // @@ -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 ); } - =20 + return Status; } =20 @@ -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 ); =20 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 ); =20 =20 @@ -5254,6 +5283,6 @@ BBTestEnableCursorFunctionAutoTest ( Status ); } - =20 + return Status; } --=20 2.32.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=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/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-