From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmx.net header.s=badeba3b8450 header.b=TrOq1SPV; spf=pass (domain: gmx.de, ip: 212.227.17.22, mailfrom: xypron.glpk@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by groups.io with SMTP; Mon, 02 Sep 2019 01:44:30 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1567413860; bh=NI9Zk8yOJodra5D7pqnEXqRLJ9/FTbyzvmT0YnUft1o=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=TrOq1SPVmnZgyTrtKs4tGm+40l1N//h/6oOwdvANObWhzt2eexdCf5al+r0xMPPI9 YLrhyYqsg/8g21+J6AnbnCT+K9gjHjRfHMWaxWkiDqUrJHv+dPWul/sf8TBzr0I6Ve 1nfGLH0EGBLpH2c2XUJzkWllI3DIwNKH4oK8nCok= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([84.118.159.3]) by mail.gmx.com (mrgmx102 [212.227.17.174]) with ESMTPSA (Nemesis) id 0MXEs5-1hhpT71YnN-00WFHw; Mon, 02 Sep 2019 10:44:20 +0200 From: "Heinrich Schuchardt" To: devel@edk2.groups.io Cc: Eric Jin , Supreeth Venkatesh , Stephano Cetola , Heinrich Schuchardt Subject: [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: assertion for UninstallMultipleProtocols Date: Mon, 2 Sep 2019 10:44:12 +0200 Message-Id: <20190902084412.3731-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:5sP3ED2uWd0VsU/gPvWmikY4na6+qOOkRY7xvHUkz3csI5buTMo N46rVe7W7TWD8CC2DzDMZYVUBljh/HY128pznMHqw1Gn3R4CyOz9oXg2yGnmcnHjzSF8sP4 pvY1Spwdgj876yWQVFgbeAs8GKu/TMImbh0zixdd/2/J9eCi/UQlGpzt6FZkIm+xZ+SVxDA gRjfTm8BJZMterd3NoXXg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:TTy5oMOtJbo=:YI3tLogho3DAnm+0QhQXeq canvzTe5wXnKoXvEng7HL4kmdJu/t5qPk2fTjp70K3rKql3cY5UlGVzhvzhn35EjZBdXACuie ZUzrXNSOD501CKYoXYD8VOc3XZIdg2oA3+PutOg5yC6d5JIDQYL43AIccRMSmH8FfuOXMC7x1 Irnfx6Mz21vzp9P30qzyQYMFPqSs1O9wirI5kmaX9ni7OwtYH8tiIbgu7pL4xLimA7d1Cjrxj OaGtpUPfeNO4GxsgLBDKhZPubLOR+4O+SeUm2vKrrlne97Wmo0wxeAgjFLpGaF6U294qtMqlG arRvvnAVl89I2tbtHXMWLe73n7QST6lQFM2mmMzk3dPoduxSu3oclz7k87JM6rD7QYSBYb4Y8 G4zJMJ978lmK9e8pVtHk0u5cmFMX+ABVSUEFH5y3ysEf7PRB7XFltZ+jEkYtpbtsWzdIVYPMz hwjWidWp/hSLUzTZu3OLruUme352unEUzKqLpsOZ1/XljErqQiRQWTZihcw0+TgolOu+K60yQ HC8w99YTPJKY7G84cy1zNMUswF5VRTkQXxxxZgMNbHKoJF45czbujz7ICfQDos5tLVwibhy9V ACCfNZAJC3XnQGlLp2Qzz76WXByEb3p1SlzRK12Ay1Hb6hhYF+mvMilvYh+L7IevAErsQgXN0 sEqj0SZTAZenadg1FiT8h9pAjPyXjRn+dG4Xm1YhemZHpnvaL3P9Am+pJANUdkHa8wZql084v O7xwoe7W97VGIFY+sFXSia2aGiZhYkOCfY2LFp48WbnedqpyWVRNgKSBOHFMm8+oZkog54lEi qxrdiH2IYB/K71i1jpmwddwSGqPBf0qNSiffrgLuZQemPsrMVVOBCeiiBv1AAFNvA9gDcoyp+ 3gRUkAENvG5anVK4iZmhGyflXjL7Trn7j+HnY7/aV/Uy91o8meBM3NFnq8eSp6xOoHz1uyRXU G+bePHMHCyFF4sJkunU/QeZHSk7T1vbFXByQHujE6j6OhYCSDQWj63ceZvpy1PwPp8Whj4xa2 +fPUiPJbggO1uKE5d7XTeplLzfPicBPfc0XqftG4HgVum2cgirD99cLFQNJlQOGupafzTLNOp bJ5gAy8fiHNqdnD2wwUk2cODCprhzqtdqO28mYdPkHy5bXs7vB9DE+BvQYt3xpwkAGb0JcTsy A4Pj8YtuY2I9vZf8DOhjGbvlkeaElgWv5dsd914PVyN4afgQ== Content-Transfer-Encoding: quoted-printable REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1869 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 --- .../BlackBoxTest/ProtocolHandlerBBTestFunction_2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandler= Services/BlackBoxTest/ProtocolHandlerBBTestFunction_2.c b/uefi-sct/SctPkg/T= estCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Protocol= HandlerBBTestFunction_2.c index c143e558..fe6146b2 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerService= s/BlackBoxTest/ProtocolHandlerBBTestFunction_2.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerService= s/BlackBoxTest/ProtocolHandlerBBTestFunction_2.c @@ -12778,7 +12778,7 @@ BBTestUninstallMultipleProtocolInterfacesInterfaceT= estCheckPoint6 ( //=0D // Step 1: check return status=0D //=0D - if (EFI_ACCESS_DENIED =3D=3D Status) {=0D + if (EFI_INVALID_PARAMETER =3D=3D Status) {=0D AssertionType =3D EFI_TEST_ASSERTION_PASSED;=0D } else {=0D AssertionType =3D EFI_TEST_ASSERTION_FAILED;=0D --=20 2.20.1