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=hsiDK0D/; spf=pass (domain: gmx.de, ip: 212.227.15.15, mailfrom: xypron.glpk@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by groups.io with SMTP; Thu, 12 Sep 2019 12:27:26 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1568316431; bh=xCjTx+QPmDg/G1N7Jq9UgleUA6nWSGbfr8t0mrzdrfc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=hsiDK0D/eS/F3qxfzkdCDSX7/DmfYN69t4/amgyBTulYzGW7ij5qmVIc5BbyU75Hk 9R3SkXZnsS93CijKkWwo3lePGBuA8B/ZyUPaGPbvj/+54xlBw8NTMHS5Mh/d6FwbNs vhsETlIofVePnnXfZcDwlOCeFe4/GNUNyVqWUjzg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([84.118.159.3]) by mail.gmx.com (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MMGN2-1hrVrE3FH4-00JM2P; Thu, 12 Sep 2019 21:27:10 +0200 From: "Heinrich Schuchardt" To: EDK II Development Cc: Eric Jin , Supreeth Venkatesh , Stephano Cetola , Heinrich Schuchardt Subject: [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: UninstallMultipleProtocols, checkpoint 7-9 Date: Thu, 12 Sep 2019 21:27:02 +0200 Message-Id: <20190912192702.26999-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:ahNYogzsEnYc2KEapCi7L1hlFNvmpI1Gyvt0mJn0AeBqx9SdxHl KBXyafEJujWUx1q/+iQTWJsdf4sp6RhTjSaCh97Bzne0r0ur2hKrqdde2b54fr7BdJV8GHP pcqgnEYGFeBO49dZTWBs/ou0Xmk5rSrhWqATRMm92ANhjbOX4VeQziSkiOQQN58dK9ZbaGD aDv+RqlfioQhQXmnZedTA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:dVpXY8FZmGs=:S9jB3HFwwSmL7oex7Ei/4C RUdn5yIaWKtkDNqSVQJkT7ObWl6QJoCvRPgrfTh0G4giQF5R8g3YgKp8hJKR4O5ii6CSybYMi zBYSaFDbUFanHpq3IHFi0OOnT+/YGnv8bUzpFukZyWBQA/45EzP+1YoqAR2JBzOE1owFJQGHm ilUXaoNH07BtOwBsC2/HnMvcWZrXoWDzJp5irnLNstisAybTh0x5Kvw6NNFnugD9ZVkG3ugVc 8Z1NjfqT0tEHn4ZjO/9OZ9iqtrRYecyfM3PEylMX8B/texHbvuTaWhAhO1TUYlVKegddvXVPn Uvi72URD4yAY+/gOO/31S3ugHMn1XHpsKv9DRyXQ7791qYpvXcotmipqFQFeI/xhbEvviHrp/ 63gw/fIwV3Fp78/1p4YFvDeqiI6D4mYV7dCm60OvFCY62W7XECTu5icQGa80nVpGYjN1hDlBg YtXehbu0iecMSNwAeyy1+etf6i4HaFn7ClyOlFGhenrdgtJgmda12FlO9D2sK2HyOE5WvBXs3 ICMXJPs21Ftz9LpUyvnxLh97DGyAtZ1IzrhiothBzt8z6pDvv/7xoICe4ybpJoOzUHA89nTYO PchMbkeXPrQCSI3cTvQ1odcVxmrG5F6Is5Fzd61ndI5uEuLEC/LZEFupDCaVNfr9AL9x5urwL ykEltNIeJJLHiq2++oMz7T2JsAsaW1y3rP7zqLM9lE+UNCzOx0ay2NSvpTiZB4R5EgVSVP43O wAJqrp8cwgTxd6aDZVKvGh/66IVodR+GdCx1B4WNdRSc+vQkyVOVwxV+YNmbWVXkEIaltZC90 XBTo2VRjlWCsRebWVyWHkB2FVS6AJ9GVl8Iwyyi29QWBQx4kFDJ0nwXJ9sHRn7mX30BWpCYTW NiE+gpKZnwaLQCNQGIG+LDEyg4en18G+W0zNZxwgpMjoIXY0tRKktwpSTYS2yKMI6bywgaLIM EAI/eKoFKvbtz69kv5LxxLINrnwIFKRUSFnUcXV+1awnoPPgwFhhySD25SaF54O3SwdvMezl7 m3Hb0aUXYNSQm1cayR4iVCuh6rWpCuFDadAam2VK6D/Byf8Ms9ngS/GnZMzHzX16bSJGamfi/ 4iYiiXsVN32Twqb48hM+sIYEonCPjaN2PdSXWccElGuc6TPPWetua/BVaCTMYzfhwKQcE9qTm JaavP0/oyvBJLzFLfXKaRCJfSWoh4H8SSKNudSQoQL4HYctq16gkJZ5TaOsW+d0j1GJfHuiw+ qBjdPSC6ZtYc8R8n/x1koIrcabqWhRYpFAMot1fXGq1H/wh8GAgrlmV9PprI= Content-Transfer-Encoding: quoted-printable REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1869 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 --- .../BlackBoxTest/ProtocolHandlerBBTestFunction_2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 fe6146b2..104e93b5 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 @@ -13108,7 +13108,7 @@ BBTestUninstallMultipleProtocolInterfacesInterfaceT= estCheckPoint7 ( //=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 @@ -13453,7 +13453,7 @@ BBTestUninstallMultipleProtocolInterfacesInterfaceT= estCheckPoint8 ( //=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 @@ -13807,7 +13807,7 @@ BBTestUninstallMultipleProtocolInterfacesInterfaceT= estCheckPoint9 ( //=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.23.0