public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: assertion for UninstallMultipleProtocols
@ 2019-09-02  8:44 Heinrich Schuchardt
  2019-09-03  5:46 ` Eric Jin
       [not found] ` <15C0D77452E5C8B1.15710@groups.io>
  0 siblings, 2 replies; 3+ messages in thread
From: Heinrich Schuchardt @ 2019-09-02  8:44 UTC (permalink / raw)
  To: devel; +Cc: Eric Jin, Supreeth Venkatesh, Stephano Cetola,
	Heinrich Schuchardt

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@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/ProtocolHandlerServices/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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: assertion for UninstallMultipleProtocols
  2019-09-02  8:44 [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: assertion for UninstallMultipleProtocols Heinrich Schuchardt
@ 2019-09-03  5:46 ` Eric Jin
       [not found] ` <15C0D77452E5C8B1.15710@groups.io>
  1 sibling, 0 replies; 3+ messages in thread
From: Eric Jin @ 2019-09-03  5:46 UTC (permalink / raw)
  To: Heinrich Schuchardt, devel@edk2.groups.io
  Cc: Supreeth Venkatesh, Stephano Cetola

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

-----Original Message-----
From: Heinrich Schuchardt <xypron.glpk@gmx.de> 
Sent: Monday, September 2, 2019 4:44 PM
To: devel@edk2.groups.io
Cc: Jin, Eric <eric.jin@intel.com>; Supreeth Venkatesh <supreeth.venkatesh@arm.com>; Stephano Cetola <stephano.cetola@linux.intel.com>; Heinrich Schuchardt <xypron.glpk@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@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


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [edk2-devel] [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: assertion for UninstallMultipleProtocols
       [not found] ` <15C0D77452E5C8B1.15710@groups.io>
@ 2019-09-06  3:53   ` Eric Jin
  0 siblings, 0 replies; 3+ messages in thread
From: Eric Jin @ 2019-09-06  3:53 UTC (permalink / raw)
  To: devel@edk2.groups.io, Jin, Eric, Heinrich Schuchardt
  Cc: Supreeth Venkatesh, Stephano Cetola

Pushed at 30c4031acbdbdaddc824c67a27ac89a749447138

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

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

-----Original Message-----
From: Heinrich Schuchardt <xypron.glpk@gmx.de> 
Sent: Monday, September 2, 2019 4:44 PM
To: devel@edk2.groups.io
Cc: Jin, Eric <eric.jin@intel.com>; Supreeth Venkatesh <supreeth.venkatesh@arm.com>; Stephano Cetola <stephano.cetola@linux.intel.com>; Heinrich Schuchardt <xypron.glpk@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@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





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-09-06  3:53 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-02  8:44 [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: assertion for UninstallMultipleProtocols Heinrich Schuchardt
2019-09-03  5:46 ` Eric Jin
     [not found] ` <15C0D77452E5C8B1.15710@groups.io>
2019-09-06  3:53   ` [edk2-devel] " Eric Jin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox