[edk2-devel] [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: assertion for UninstallMultipleProtocols

Eric Jin eric.jin at intel.com
Fri Sep 6 03:53:06 UTC 2019


Pushed at 30c4031acbdbdaddc824c67a27ac89a749447138

-----Original Message-----
From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Eric Jin
Sent: Tuesday, September 3, 2019 1:46 PM
To: Heinrich Schuchardt <xypron.glpk at gmx.de>; devel at edk2.groups.io
Cc: Supreeth Venkatesh <supreeth.venkatesh at arm.com>; Stephano Cetola <stephano.cetola at linux.intel.com>
Subject: Re: [edk2-devel] [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: assertion for UninstallMultipleProtocols

Reviewed-by: Eric Jin <eric.jin at intel.com>

-----Original Message-----
From: Heinrich Schuchardt <xypron.glpk at gmx.de> 
Sent: Monday, September 2, 2019 4:44 PM
To: devel at edk2.groups.io
Cc: Jin, Eric <eric.jin at intel.com>; Supreeth Venkatesh <supreeth.venkatesh at arm.com>; Stephano Cetola <stephano.cetola at linux.intel.com>; Heinrich Schuchardt <xypron.glpk at gmx.de>
Subject: [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: assertion for UninstallMultipleProtocols

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1869

BS.UninstallMultipleProtocolInterfaces - InterfaceTestCheckpoint6 expects
UninstallMultipleProtocols() to return EFI_ACCESS_DENIED but the UEFI spec
has:

"If any errors are generated while the protocol interfaces are being uninstalled, then the protocols uninstalled prior to the error will be reinstalled with the boot service
EFI_BOOT_SERVICES.InstallProtocolInterface() and the status code EFI_INVALID_PARAMETER is returned."

So the SCT should check for EFI_INVALID_PARAMETER and not for EFI_ACCESS_DENIED.

Correct the assertion.

Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
---
 .../BlackBoxTest/ProtocolHandlerBBTestFunction_2.c              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction_2.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction_2.c
index c143e558..fe6146b2 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction_2.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServ
+++ ices/BlackBoxTest/ProtocolHandlerBBTestFunction_2.c
@@ -12778,7 +12778,7 @@ BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint6 (
     //     // Step 1: check return status     //-    if (EFI_ACCESS_DENIED == Status) {+    if (EFI_INVALID_PARAMETER == Status) {       AssertionType = EFI_TEST_ASSERTION_PASSED;     } else {       AssertionType = EFI_TEST_ASSERTION_FAILED;-- 
2.20.1





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#46957): https://edk2.groups.io/g/devel/message/46957
Mute This Topic: https://groups.io/mt/33109181/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-





More information about the edk2-devel-archive mailing list