From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web08.4472.1650331821613050429 for ; Mon, 18 Apr 2022 18:30:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@linux.microsoft.com header.s=default header.b=eecBuoPz; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: mikuback@linux.microsoft.com) Received: from localhost.localdomain (unknown [47.201.46.36]) by linux.microsoft.com (Postfix) with ESMTPSA id 54AA320C360D; Mon, 18 Apr 2022 18:30:20 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 54AA320C360D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1650331821; bh=BLt7rpxaqBTu/ln7i5mfGvlivc7TN+JvyqAz7EBvMeI=; h=From:To:Cc:Subject:Date:From; b=eecBuoPzEfUEwnHF63Nr/MuDp89jCGjCzYu4gwRPh1Ahd2UALOq00cBQz/gd7LYoy o5jaPJ5+t2CPMI0B3mFsgKqx1Gb9ZmyQqTLgvE1wybpm/4FW5nft9q4wWMqb/7JfVG 56fhdfZE0t6W/8IgihRAH7n5AXtW8Jkpy1qqzF0c= From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Michael Kubacki , Nate DeSimone , Ankit Sinha Subject: [PATCH v1 1/1] PrmPkg/DxePrmContextBufferLib: Fix unit test GCC compilation errors Date: Mon, 18 Apr 2022 21:27:17 -0400 Message-Id: <20220419012717.1557-1-mikuback@linux.microsoft.com> X-Mailer: git-send-email 2.28.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Kubacki https://bugzilla.tianocore.org/show_bug.cgi?id=3D3905 Fixes GCC compilation errors in DxePrmContextBufferLibUnitTest.c. Cc: Michael Kubacki Cc: Nate DeSimone Cc: Ankit Sinha Signed-off-by: Michael Kubacki --- PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBufferLibUni= tTest.c | 28 +++++++------------- 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContext= BufferLibUnitTest.c b/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxeP= rmContextBufferLibUnitTest.c index e244e7b09575..fdc32993b82d 100644 --- a/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBufferL= ibUnitTest.c +++ b/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBufferL= ibUnitTest.c @@ -237,17 +237,17 @@ NullPointerArgumentsShouldFailGracefully ( PRM_MODULE_CONTEXT_BUFFERS *ModuleContextBuffersPtr; =20 UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (NULL, NULL, NULL), = EFI_INVALID_PARAMETER); - UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (NULL, &ModuleContex= tBuffers, &ContextBufferPtr), EFI_INVALID_PARAMETER); - UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (&Guid, NULL, &Conte= xtBufferPtr), EFI_INVALID_PARAMETER); + UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (NULL, &ModuleContex= tBuffers, (CONST PRM_CONTEXT_BUFFER **)&ContextBufferPtr), EFI_INVALID_PA= RAMETER); + UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (&Guid, NULL, (CONST= PRM_CONTEXT_BUFFER **)&ContextBufferPtr), EFI_INVALID_PARAMETER); UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (&Guid, &ModuleConte= xtBuffers, NULL), EFI_INVALID_PARAMETER); =20 UT_ASSERT_EQUAL (GetModuleContextBuffers (ByModuleGuid, NULL, NULL), E= FI_INVALID_PARAMETER); - UT_ASSERT_EQUAL (GetModuleContextBuffers (ByModuleGuid, NULL, &ModuleC= ontextBuffersPtr), EFI_INVALID_PARAMETER); + UT_ASSERT_EQUAL (GetModuleContextBuffers (ByModuleGuid, NULL, (CONST P= RM_MODULE_CONTEXT_BUFFERS **)&ModuleContextBuffersPtr), EFI_INVALID_PARAM= ETER); UT_ASSERT_EQUAL (GetModuleContextBuffers (ByModuleGuid, &Guid, NULL), = EFI_INVALID_PARAMETER); =20 UT_ASSERT_EQUAL (GetContextBuffer (NULL, NULL, NULL), EFI_INVALID_PARA= METER); - UT_ASSERT_EQUAL (GetContextBuffer (NULL, &ModuleContextBuffers, &Conte= xtBufferPtr), EFI_INVALID_PARAMETER); - UT_ASSERT_EQUAL (GetContextBuffer (&Guid, NULL, &ContextBufferPtr), EF= I_NOT_FOUND); + UT_ASSERT_EQUAL (GetContextBuffer (NULL, &ModuleContextBuffers, (CONST= PRM_CONTEXT_BUFFER **)&ContextBufferPtr), EFI_INVALID_PARAMETER); + UT_ASSERT_EQUAL (GetContextBuffer (&Guid, NULL, (CONST PRM_CONTEXT_BUF= FER **)&ContextBufferPtr), EFI_NOT_FOUND); UT_ASSERT_EQUAL (GetContextBuffer (&Guid, &ModuleContextBuffers, NULL)= , EFI_INVALID_PARAMETER); =20 return UNIT_TEST_PASSED; @@ -322,7 +322,7 @@ InitializeFunctionalCorrectness ( =20 **/ STATIC -UNIT_TEST_STATUS +VOID EFIAPI DeInitializeFunctionalCorrectness ( IN UNIT_TEST_CONTEXT Context @@ -332,7 +332,6 @@ DeInitializeFunctionalCorrectness ( PRM_CONFIG_PROTOCOL *PrmConfigProtocol; PRM_CONTEXT_BUFFERS_TEST_CONTEXT *TestContext; =20 - UT_ASSERT_NOT_NULL (Context); TestContext =3D (PRM_CONTEXT_BUFFERS_TEST_CONTEXT *)Context; =20 Status =3D gBS->HandleProtocol ( @@ -340,7 +339,6 @@ DeInitializeFunctionalCorrectness ( &gPrmConfigProtocolGuid, (VOID **)&PrmConfigProtocol ); - UT_ASSERT_NOT_EFI_ERROR (Status); =20 if (!EFI_ERROR (Status)) { Status =3D gBS->UninstallProtocolInterface ( @@ -348,13 +346,10 @@ DeInitializeFunctionalCorrectness ( &gPrmConfigProtocolGuid, PrmConfigProtocol ); - UT_ASSERT_NOT_EFI_ERROR (Status); if (!EFI_ERROR (Status)) { FreePool (PrmConfigProtocol); } } - - return UNIT_TEST_PASSED; } =20 /** @@ -382,7 +377,7 @@ VerifyGetModuleContextBuffers ( ContextBuffers =3D NULL; TestContext =3D (PRM_CONTEXT_BUFFERS_TEST_CONTEXT *)Context; =20 - Status =3D GetModuleContextBuffers (TestContext->GuidSearchType, TestC= ontext->Guid, &ContextBuffers); + Status =3D GetModuleContextBuffers (TestContext->GuidSearchType, TestC= ontext->Guid, (CONST PRM_MODULE_CONTEXT_BUFFERS **)&ContextBuffers); UT_ASSERT_STATUS_EQUAL (Status, TestContext->ExpectedStatus); =20 if (!EFI_ERROR (TestContext->ExpectedStatus)) { @@ -419,14 +414,12 @@ VerifyFindContextBufferInModuleBuffers ( { EFI_STATUS Status; PRM_CONTEXT_BUFFER *FoundContextBuffer; - PRM_MODULE_CONTEXT_BUFFERS *ContextBuffers; PRM_CONTEXT_BUFFER_TEST_CONTEXT *TestContext; =20 - ContextBuffers =3D NULL; FoundContextBuffer =3D NULL; TestContext =3D (PRM_CONTEXT_BUFFER_TEST_CONTEXT *)Context; =20 - Status =3D FindContextBufferInModuleBuffers (TestContext->HandlerGuid,= TestContext->ContextBuffers, &FoundContextBuffer); + Status =3D FindContextBufferInModuleBuffers (TestContext->HandlerGuid,= TestContext->ContextBuffers, (CONST PRM_CONTEXT_BUFFER **)&FoundContextB= uffer); UT_ASSERT_STATUS_EQUAL (Status, TestContext->ExpectedStatus); =20 if (!EFI_ERROR (TestContext->ExpectedStatus)) { @@ -465,14 +458,13 @@ VerifyGetContextBuffer ( { EFI_STATUS Status; PRM_CONTEXT_BUFFER *FoundContextBuffer; - PRM_MODULE_CONTEXT_BUFFERS *ContextBuffers; PRM_CONTEXT_BUFFER_TEST_CONTEXT *TestContext; =20 - ContextBuffers =3D NULL; FoundContextBuffer =3D NULL; TestContext =3D (PRM_CONTEXT_BUFFER_TEST_CONTEXT *)Context; =20 - Status =3D GetContextBuffer (TestContext->HandlerGuid, TestContext->Co= ntextBuffers, &FoundContextBuffer); + Status =3D GetContextBuffer (TestContext->HandlerGuid, TestContext->Co= ntextBuffers, (CONST PRM_CONTEXT_BUFFER **)&FoundContextBuffer); + UT_ASSERT_STATUS_EQUAL (Status, TestContext->ExpectedStatus); =20 if (!EFI_ERROR (TestContext->ExpectedStatus)) { --=20 2.28.0.windows.1