* [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: UninstallMultipleProtocols, checkpoint 7-9
@ 2019-09-12 19:27 Heinrich Schuchardt
2019-09-16 2:30 ` [edk2-devel] " Eric Jin
[not found] ` <15C4CA552BD488C6.29413@groups.io>
0 siblings, 2 replies; 3+ messages in thread
From: Heinrich Schuchardt @ 2019-09-12 19:27 UTC (permalink / raw)
To: EDK II Development
Cc: Eric Jin, Supreeth Venkatesh, Stephano Cetola,
Heinrich Schuchardt
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@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/ProtocolHandlerServices/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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [edk2-devel] [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: UninstallMultipleProtocols, checkpoint 7-9
2019-09-12 19:27 [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: UninstallMultipleProtocols, checkpoint 7-9 Heinrich Schuchardt
@ 2019-09-16 2:30 ` Eric Jin
[not found] ` <15C4CA552BD488C6.29413@groups.io>
1 sibling, 0 replies; 3+ messages in thread
From: Eric Jin @ 2019-09-16 2:30 UTC (permalink / raw)
To: devel@edk2.groups.io, xypron.glpk@gmx.de
Cc: Supreeth Venkatesh, Stephano Cetola
Reviewed-by: Eric Jin <eric.jin@intel.com>
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Heinrich Schuchardt
Sent: Friday, September 13, 2019 3:27 AM
To: EDK II Development <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-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@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@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [eric.jin@intel.com] -=-=-=-=-=-=
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [edk2-devel] [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: UninstallMultipleProtocols, checkpoint 7-9
[not found] ` <15C4CA552BD488C6.29413@groups.io>
@ 2019-09-17 1:03 ` Eric Jin
0 siblings, 0 replies; 3+ messages in thread
From: Eric Jin @ 2019-09-17 1:03 UTC (permalink / raw)
To: devel@edk2.groups.io, xypron.glpk@gmx.de
Cc: Supreeth Venkatesh, Stephano Cetola
Push at d296b56b6aca94dcbb3fc4dffb4ed36051539084
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Eric Jin
Sent: Monday, September 16, 2019 10:31 AM
To: devel@edk2.groups.io; xypron.glpk@gmx.de
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: UninstallMultipleProtocols, checkpoint 7-9
Reviewed-by: Eric Jin <eric.jin@intel.com>
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Heinrich Schuchardt
Sent: Friday, September 13, 2019 3:27 AM
To: EDK II Development <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-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@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@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [eric.jin@intel.com] -=-=-=-=-=-=
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-09-17 1:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-12 19:27 [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: UninstallMultipleProtocols, checkpoint 7-9 Heinrich Schuchardt
2019-09-16 2:30 ` [edk2-devel] " Eric Jin
[not found] ` <15C4CA552BD488C6.29413@groups.io>
2019-09-17 1:03 ` Eric Jin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox