[edk2-devel] [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: UninstallMultipleProtocols, checkpoint 7-9

[Eric Jin]

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

-----Original Message-----
From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Heinrich Schuchardt
Sent: Friday, September 13, 2019 3:27 AM
To: EDK II Development <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-devel] [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: UninstallMultipleProtocols, checkpoint 7-9

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

BS.UninstallMultipleProtocolInterfaces - InterfaceTestCheckpoint7 - 9 expect 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 assertions.

InterfaceCheckpoint6 has already been corrected with commit 30c4031acbdb
("uefi-sct/SctPkg: assertion for UninstallMultipleProtocols")

Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
---
 .../BlackBoxTest/ProtocolHandlerBBTestFunction_2.c          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 fe6146b2..104e93b5 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
@@ -13108,7 +13108,7 @@ BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint7 (
     //     // 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;@@ -13453,7 +13453,7 @@ BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint8 (
     //     // 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;@@ -13807,7 +13807,7 @@ BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint9 (
     //     // 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.23.0


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

View/Reply Online (#47199): https://edk2.groups.io/g/devel/message/47199
Mute This Topic: https://groups.io/mt/34118784/1787343
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [eric.jin at intel.com] -=-=-=-=-=-=


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

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