From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by mx.groups.io with SMTP id smtpd.web09.16439.1631128904403094778 for ; Wed, 08 Sep 2021 12:21:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmx.net header.s=badeba3b8450 header.b=iwzvnv6F; spf=pass (domain: gmx.de, ip: 212.227.17.20, mailfrom: xypron.glpk@gmx.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1631128882; bh=EDES7ngRP238ws3RWWEQvgFdcvtA+zqMfjB1DO5vS5s=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=iwzvnv6FG+KwR+wRL20cYb783OeNnF5kAb8eexYxSm9fW3e6U2A00BkWsN8iHlahm jDVGtW2Nr1z6Iye3aJtNTnadgKW9rjCKLxTCoA25wdmAoPPqsyvUsmGsOapsCLf/1J jCjx8Hu0s0/H6CrKcC2G5BXesyb0udfd+h3sqJrk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([88.152.144.157]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N17UQ-1n4dE82BeU-012WmA; Wed, 08 Sep 2021 21:21:22 +0200 From: "Heinrich Schuchardt" To: EDK II Development Cc: Eric Jin , G Edhaya Chandran , Barton Gao , Arvin Chen , Samer El-Haj-Mahmoud , Heinrich Schuchardt Subject: [PATCH edk2-test v2 1/1] uefi-sct/SctPkg: fix BuildAtaDeviceNode() Date: Wed, 8 Sep 2021 21:21:13 +0200 Message-Id: <20210908192113.5273-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:tspj7at6mV81Vv/3I/js08zxAB81OGsgup83uFN8f/wyiPSc+TI S2qNPocjofV67ic1kgZ0HCQmnrfQCcoClcA/JaeYSCMiyd1IsWWB/q/LDfARJquDTJqllMS bzxcF567DcHnWffXZPEBbtt+8RuLU3mlk8lM7A3Bmi2HxaQV62jPaaTCp14DproiaW9i1qs uRLxiy/iiVmCphnC+ejuA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:v/YyQ3I3ymk=:dQlJsTZaCxe1YCE4LdQHAE r9GWE4ahn+7nBrNErhjxLO6L+xkYxw5BZN2zOMhHf7R7ovKEeD14aNLWOWA+96NvsoA4g2Hza 3VMXsm7WhlE7aIx8OIEgh9nAA7LVRkW9D+LYFoGYIoqJ1uGv7Cz0+m0AagDLB9339ubyWoHoc FVkGIwSQG+1q2SYhuUoJT4x208cnOEHtEblVCh2TJfbC8Ql/KoC1ol6KhSFzKAz2vwLG+5s2T Lua3ntc7xrrLESBbpkgzvtjlUpMdwCD685+Hg5oMhIvegqgt+tsq+Uxujk7bafGZMXYu1l4NF USqnSNJ2TRK+5g5ulsa7QsHXfZ2K0u0C0mngOfZK/voJIxttXSlbUX5Xad2BILcyba1hG6wtj AUJ1ETf64HpUs/aDJ+GYrmy2ot0C4Ik9yIS3WOuDaD4K6nAQVgqNPQPtKLrW4DsUeNn1k28+1 NaAXqu8a3prFx0igwUIwaHDXi5Gng6bCoYqCGxJOOIh7FfXTG+BXxjtdPqGbBbqEPGMYD2W4I KdLavCF0BaEi4/2ID1MNGMF8pCcXmWptBlL9x54OTd+mzVtEKLfL8AedCukqVP38ivBrYehaI 1GWtoaQQKJxgmnvopcCxZRBjbyF7eQoohcd8k3rXwKZ/QkQisDz2klBpIGHLzWd16RFtJQs6n Sfr9/TpLqlxtkEwc3dgxRt0uvNWGH82p65Phv1NeQswn63yvzNr4FtJtoVEcPg8hjEnxiFjw6 w1NOiShm9a30yqPxJJshSGVUNvxIQN5MUtFTB9auwuue/L6MTlzYj5U14wTZmKlOPwcYxKROI LCsXYOyRwn1P9GqF9OIemeuLlmduBk/pT/AZUL19ZMGqfUGVqaGnGcbmmy4NgK4CWHedgHn6A aeCHBFx/pfxT/BfLlYdCe4f5eKyOswJzm05l/EfW4E+Iyozl+6v9xgfrioGuQyNePK8wudKXK RYwOWag7aLmfiY89hEkYGh9UCdK31z7cznEn50nhmhC3Y1J5gDVAtTr2f4oW00+YzgYgh1NLn vYsurAI5NXtWwUNoSldpMhMb8hJTihVfPDk6gSmhgodXxUVjvxS7QSqHboo8bvZScvqNj8yKp +8FOd9HNxCXWkw= Content-Transfer-Encoding: quoted-printable REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3290 When BuildAtaDeviceNode() is called with L"Ata(0,0,0)" it creates a node Ata(1,1,0). This leads to test to an assertion failed test result ../DevicePathToTextBBTestFunction.c:332: Convert result: Ata(0,0,0) - Expected: Ata(Primary,Master,0) Signed-off-by: Heinrich Schuchardt =2D-- v2: correct parentheses =2D-- .../BlackBoxTest/DevicePathToTextBBTestMain.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/B= lackBoxTest/DevicePathToTextBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/E= FI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestMain.c index 46b97a2d2648..183434ee1c78 100644 =2D-- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackB= oxTest/DevicePathToTextBBTestMain.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBox= Test/DevicePathToTextBBTestMain.c @@ -1162,9 +1162,9 @@ BuildAtaDeviceNode ( Status =3D GetNextRequiredParam(&TextDeviceNode, L"Controller", &ParamI= dentifierStr, &ParamIdentifierVal); if ((!EFI_ERROR(Status)) && (ParamIdentifierVal !=3D NULL)) { - if ((SctStrCmp (ParamIdentifierVal, L"Primary") =3D=3D 0) || (SctStrCm= p(ParamIdentifierVal, L"0"))) { + if ((SctStrCmp (ParamIdentifierVal, L"Primary") =3D=3D 0) || (SctStrC= mp(ParamIdentifierVal, L"0") =3D=3D 0)) { Atapi->PrimarySecondary =3D 0; - } else if ((SctStrCmp (ParamIdentifierVal, L"Secondary") =3D=3D 0) ||= (SctStrCmp(ParamIdentifierVal, L"1"))) { + } else if ((SctStrCmp (ParamIdentifierVal, L"Secondary") =3D=3D 0) ||= (SctStrCmp(ParamIdentifierVal, L"1") =3D=3D 0)) { Atapi->PrimarySecondary =3D 1; } else { goto InValidText; @@ -1175,9 +1175,9 @@ BuildAtaDeviceNode ( Status =3D GetNextRequiredParam(&TextDeviceNode, L"Drive", &ParamIdenti= fierStr, &ParamIdentifierVal); if ((!EFI_ERROR(Status)) && (ParamIdentifierVal !=3D NULL)) { - if ((SctStrCmp (ParamIdentifierVal, L"Master") =3D=3D 0) || (SctStrCmp= (ParamIdentifierVal, L"0"))) { + if ((SctStrCmp (ParamIdentifierVal, L"Master") =3D=3D 0) || (SctStrCm= p(ParamIdentifierVal, L"0") =3D=3D 0)) { Atapi->SlaveMaster =3D 0; - } else if ((SctStrCmp (ParamIdentifierVal, L"Slave") =3D=3D 0) || (Sc= tStrCmp(ParamIdentifierVal, L"1"))) { + } else if ((SctStrCmp (ParamIdentifierVal, L"Slave") =3D=3D 0) || (Sc= tStrCmp(ParamIdentifierVal, L"1") =3D=3D 0)) { Atapi->SlaveMaster =3D 1; } else { goto InValidText; =2D- 2.30.2