From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by mx.groups.io with SMTP id smtpd.web11.8597.1617205161661352066 for ; Wed, 31 Mar 2021 08:39:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmx.net header.s=badeba3b8450 header.b=MltstVhS; spf=pass (domain: gmx.de, ip: 212.227.15.19, mailfrom: xypron.glpk@gmx.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1617205144; bh=48YbDPdp+0IuN3GJP3D8NsZ6RTjP8i2/prYL4U9cjFM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=MltstVhSL96cSJhvPfs5ig1ih5QwrQ7WSfzl8p6TxAtL+c/huP70xaqo45eqs3Q7b r0qjX0lQxyHupCfYU+fNB/1PgE/UzLdwbbFZJI2yGnwQtRrdqsiXZrH0WL84UFQa5I +GgAXggY9cAdQsj3ByYId3UNorMrG7IIgk4+DBW0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from workstation4.fritz.box ([62.143.247.63]) by mail.gmx.net (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MLR1V-1lAv1v0F4F-00IW8n; Wed, 31 Mar 2021 17:39:04 +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 1/1] uefi-sct/SctPkg: fix BuildAtaDeviceNode() Date: Wed, 31 Mar 2021 17:38:55 +0200 Message-Id: <20210331153855.62803-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:bUbjQf6qQ9dB3B4hLjDPvd3d+AtiF9p1trw9KMS67e9ROqM6OuM ZiTd737Dk5txOmx8EdYFj+a+/TdDuVPs1nOMEhPjWusllMnx+Cd5gscST6vgwt2M6BD2S0g q0RQbVf+jChvXts+YCkk77aR7jLQx6uzNurwHJNinOS6zsB4WuVcLiiwlIvdlgL8vTzqx3M XyTS2y1pa29P2s/CVVU1g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:qeER/IN7Nqc=:EFkjZ2hjuZukZZ+DxqjZqs EXB+/8B+ucvZpOO8LWeROYsmjiN89exbnV9nm/9LQWDBvbEqgS6oMVo38ZppgPvZnd/BUqKGx RzyFMlt/hkMXbG6qZ56LC7SQXvbeA5WZPRfPo6+rafmU6uoSZAILUpfoMl7c0gEQDWF/PHoZ2 nguNmcMv9pBkXhRXMrCvq5hteJFX4Y7qtePZA2QTOxb4JskAUM25UUNTB8HN9GE1xa4i8n296 +OVLRiGhU8bGc31L21aTFyglHcXGfbH5qtEWbRVhiJQMxHDI5VRFDcHqXhY7v0+v4hCThKux3 X/sNRG+TUnDpMmsoaaEgYgrxmxlcPwZWl+qtAhmneviI2MjqjIGkXAvWSoA1bpn9dW8obetRh xRQqAa4KpHLdre3Z+fNf81gcnwUFtSgWvBv8Xjb0iyxVi6QJjnYQfOaq1D7z3acVBXRib/ndP nXDwkP8HpExEy6PeKjDMI8OqtUoq8t/na6Fs4vFFOyo96LzAjidx5hQTVHJ1G2qMffHfBxO9G hhYzoJyFTOuOQ1oNuyhLs1HNOUfmCAyd5hX0KxjXegM42UcXX81+MHdbj5fC+nQ/coP+Ws723 xxml/XuP1DQNTPDCWap9kjLdq/N1FNFRvbXclIBRyQriCCWiNucDpJswoGas2RqTe82WpWJej KjXPgjak/3qY0YbVdNhq526kXn16q4vaWSwV2xgKhTFhU5dxl6A1Ag2yqFXEOhZzE90hECKun Mu3vKGlLekep9DbZRbfnLXDN8UZ9LiKZMpeBer5o6nbDc8f243XM11OUNpwxOaHOwHpqvEpzp O4n0PbRcIfWCf5xBrTSvwDMLUax10nAvu5MrRRNsO9BC0wMtiAITHRL/VnexgqSW+vOVSF80m dW9aLT2SU82PdycEg7ZYRZX13QliaS5BE2ZKEU/bn4y8Qsp1SC924ZkpJGf6F6xTW6me4Fzik QhnX8t/SN1KEkpVF5kRiR4fFdN1FLQZtUCJWPO1O+go1uyXJIDBku+dfULzHzTXQDf3T9RP8b pP86wpkU53ngkRsbtU+1/hkPeQJp7L0xIWDWgX7dFwUQ/OI8BMTDOtK5bO0wSjifkzpaluS6o 8EHRSz5D5YjX0IjcOjL462GSbuHBiAAcJTB4BRBxge7LI7njjHyGiOilE8JJwI8G9pSHVSf7i PpWPlffZN57CXK9kGyetQFEN3XtQ1CL5udD2H1KkNK46wHpW0rR2OnuAuG2QqjdKbaJvY= 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-- .../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 7cf473d30643..59f9cc71831b 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