Re: [edk2-devel] [PATCH v1 1/1] PrmPkg/DxePrmContextBufferLib: Fix unit test GCC compilation errors

2022-04-20 Thread Sinha, Ankit 
Reviewed-by: Ankit Sinha 


> -Original Message-
> From: devel@edk2.groups.io  On Behalf Of Michael
> Kubacki
> Sent: Monday, April 18, 2022 6:27 PM
> To: devel@edk2.groups.io
> Cc: Michael Kubacki ; Desimone, Nathaniel
> L ; Sinha, Ankit 
> Subject: [edk2-devel] [PATCH v1 1/1] PrmPkg/DxePrmContextBufferLib: Fix
> unit test GCC compilation errors
> 
> From: Michael Kubacki 
> 
> https://bugzilla.tianocore.org/show_bug.cgi?id=3905
> 
> 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/DxePrmContextBufferLi
> bUnitTest.c | 28 +++-
>  1 file changed, 10 insertions(+), 18 deletions(-)
> 
> diff --git
> a/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBuffer
> LibUnitTest.c
> b/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBuffer
> LibUnitTest.c
> index e244e7b09575..fdc32993b82d 100644
> ---
> a/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBuffer
> LibUnitTest.c
> +++
> b/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBuffer
> +++ LibUnitTest.c
> @@ -237,17 +237,17 @@ NullPointerArgumentsShouldFailGracefully (
>PRM_MODULE_CONTEXT_BUFFERS  *ModuleContextBuffersPtr;
> 
>UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (NULL, NULL,
> NULL), EFI_INVALID_PARAMETER);
> -  UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (NULL,
> , ), EFI_INVALID_PARAMETER);
> -  UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (, NULL,
> ), EFI_INVALID_PARAMETER);
> +  UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (NULL,
> + , (CONST PRM_CONTEXT_BUFFER
> + **)), EFI_INVALID_PARAMETER);  UT_ASSERT_EQUAL
> + (FindContextBufferInModuleBuffers (, NULL, (CONST
> + PRM_CONTEXT_BUFFER **)),
> EFI_INVALID_PARAMETER);
>UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (,
> , NULL), EFI_INVALID_PARAMETER);
> 
>UT_ASSERT_EQUAL (GetModuleContextBuffers (ByModuleGuid, NULL,
> NULL), EFI_INVALID_PARAMETER);
> -  UT_ASSERT_EQUAL (GetModuleContextBuffers (ByModuleGuid, NULL,
> ), EFI_INVALID_PARAMETER);
> +  UT_ASSERT_EQUAL (GetModuleContextBuffers (ByModuleGuid, NULL,
> (CONST
> + PRM_MODULE_CONTEXT_BUFFERS **)),
> + EFI_INVALID_PARAMETER);
>UT_ASSERT_EQUAL (GetModuleContextBuffers (ByModuleGuid, ,
> NULL), EFI_INVALID_PARAMETER);
> 
>UT_ASSERT_EQUAL (GetContextBuffer (NULL, NULL, NULL),
> EFI_INVALID_PARAMETER);
> -  UT_ASSERT_EQUAL (GetContextBuffer (NULL, ,
> ), EFI_INVALID_PARAMETER);
> -  UT_ASSERT_EQUAL (GetContextBuffer (, NULL, ),
> EFI_NOT_FOUND);
> +  UT_ASSERT_EQUAL (GetContextBuffer (NULL, ,
> + (CONST PRM_CONTEXT_BUFFER **)),
> + EFI_INVALID_PARAMETER);  UT_ASSERT_EQUAL (GetContextBuffer
> (,
> + NULL, (CONST PRM_CONTEXT_BUFFER **)),
> EFI_NOT_FOUND);
>UT_ASSERT_EQUAL (GetContextBuffer (, ,
> NULL), EFI_INVALID_PARAMETER);
> 
>return UNIT_TEST_PASSED;
> @@ -322,7 +322,7 @@ InitializeFunctionalCorrectness (
> 
>  **/
>  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;
> 
> -  UT_ASSERT_NOT_NULL (Context);
>TestContext = (PRM_CONTEXT_BUFFERS_TEST_CONTEXT *)Context;
> 
>Status = gBS->HandleProtocol (
> @@ -340,7 +339,6 @@ DeInitializeFunctionalCorrectness (
>,
>(VOID **)
>);
> -  UT_ASSERT_NOT_EFI_ERROR (Status);
> 
>if (!EFI_ERROR (Status)) {
>  Status =  gBS->UninstallProtocolInterface ( @@ -348,13 +346,10 @@
> DeInitializeFunctionalCorrectness (
>   ,
>   PrmConfigProtocol
>   );
> -UT_ASSERT_NOT_EFI_ERROR (Status);
>  if (!EFI_ERROR (Status)) {
>FreePool (PrmConfigProtocol);
>  }
>}
> -
> -  return UNIT_TEST_PASSED;
>  }
> 
>  /**
> @@ -382,7 +377,7 @@ VerifyGetModuleContextBuffers (
>ContextBuffers = NULL;
>TestContext= (PRM_CONTEXT_BUFFERS_TEST_CONTEXT *)Context;
> 
> -  Status = GetModuleContextBuffers (TestContext->GuidSearchType,
> TestContext->Guid, );
> +  Status = GetModuleContextBuffers (TestContext->GuidSearchType,
> + TestContext->Guid, (CONST PRM_MODULE_CONTEXT_BUFFERS
> + **));
>UT_ASSERT_STATUS_EQUAL (Status, TestContext->ExpectedStatus);
> 
>if (!EFI_ERROR (TestContext->ExpectedStatus)) { @@ -4

[edk2-devel] [PATCH v1 1/1] PrmPkg/DxePrmContextBufferLib: Fix unit test GCC compilation errors

2022-04-18 Thread Michael Kubacki 
From: Michael Kubacki 

https://bugzilla.tianocore.org/show_bug.cgi?id=3905

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/DxePrmContextBufferLibUnitTest.c 
| 28 +++-
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git 
a/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBufferLibUnitTest.c
 
b/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBufferLibUnitTest.c
index e244e7b09575..fdc32993b82d 100644
--- 
a/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBufferLibUnitTest.c
+++ 
b/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBufferLibUnitTest.c
@@ -237,17 +237,17 @@ NullPointerArgumentsShouldFailGracefully (
   PRM_MODULE_CONTEXT_BUFFERS  *ModuleContextBuffersPtr;
 
   UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (NULL, NULL, NULL), 
EFI_INVALID_PARAMETER);
-  UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (NULL, 
, ), EFI_INVALID_PARAMETER);
-  UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (, NULL, 
), EFI_INVALID_PARAMETER);
+  UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (NULL, 
, (CONST PRM_CONTEXT_BUFFER **)), 
EFI_INVALID_PARAMETER);
+  UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (, NULL, (CONST 
PRM_CONTEXT_BUFFER **)), EFI_INVALID_PARAMETER);
   UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (, 
, NULL), EFI_INVALID_PARAMETER);
 
   UT_ASSERT_EQUAL (GetModuleContextBuffers (ByModuleGuid, NULL, NULL), 
EFI_INVALID_PARAMETER);
-  UT_ASSERT_EQUAL (GetModuleContextBuffers (ByModuleGuid, NULL, 
), EFI_INVALID_PARAMETER);
+  UT_ASSERT_EQUAL (GetModuleContextBuffers (ByModuleGuid, NULL, (CONST 
PRM_MODULE_CONTEXT_BUFFERS **)), EFI_INVALID_PARAMETER);
   UT_ASSERT_EQUAL (GetModuleContextBuffers (ByModuleGuid, , NULL), 
EFI_INVALID_PARAMETER);
 
   UT_ASSERT_EQUAL (GetContextBuffer (NULL, NULL, NULL), EFI_INVALID_PARAMETER);
-  UT_ASSERT_EQUAL (GetContextBuffer (NULL, , 
), EFI_INVALID_PARAMETER);
-  UT_ASSERT_EQUAL (GetContextBuffer (, NULL, ), 
EFI_NOT_FOUND);
+  UT_ASSERT_EQUAL (GetContextBuffer (NULL, , (CONST 
PRM_CONTEXT_BUFFER **)), EFI_INVALID_PARAMETER);
+  UT_ASSERT_EQUAL (GetContextBuffer (, NULL, (CONST PRM_CONTEXT_BUFFER 
**)), EFI_NOT_FOUND);
   UT_ASSERT_EQUAL (GetContextBuffer (, , NULL), 
EFI_INVALID_PARAMETER);
 
   return UNIT_TEST_PASSED;
@@ -322,7 +322,7 @@ InitializeFunctionalCorrectness (
 
 **/
 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;
 
-  UT_ASSERT_NOT_NULL (Context);
   TestContext = (PRM_CONTEXT_BUFFERS_TEST_CONTEXT *)Context;
 
   Status = gBS->HandleProtocol (
@@ -340,7 +339,6 @@ DeInitializeFunctionalCorrectness (
   ,
   (VOID **)
   );
-  UT_ASSERT_NOT_EFI_ERROR (Status);
 
   if (!EFI_ERROR (Status)) {
 Status =  gBS->UninstallProtocolInterface (
@@ -348,13 +346,10 @@ DeInitializeFunctionalCorrectness (
  ,
  PrmConfigProtocol
  );
-UT_ASSERT_NOT_EFI_ERROR (Status);
 if (!EFI_ERROR (Status)) {
   FreePool (PrmConfigProtocol);
 }
   }
-
-  return UNIT_TEST_PASSED;
 }
 
 /**
@@ -382,7 +377,7 @@ VerifyGetModuleContextBuffers (
   ContextBuffers = NULL;
   TestContext= (PRM_CONTEXT_BUFFERS_TEST_CONTEXT *)Context;
 
-  Status = GetModuleContextBuffers (TestContext->GuidSearchType, 
TestContext->Guid, );
+  Status = GetModuleContextBuffers (TestContext->GuidSearchType, 
TestContext->Guid, (CONST PRM_MODULE_CONTEXT_BUFFERS **));
   UT_ASSERT_STATUS_EQUAL (Status, TestContext->ExpectedStatus);
 
   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;
 
-  ContextBuffers = NULL;
   FoundContextBuffer = NULL;
   TestContext= (PRM_CONTEXT_BUFFER_TEST_CONTEXT *)Context;
 
-  Status = FindContextBufferInModuleBuffers (TestContext->HandlerGuid, 
TestContext->ContextBuffers, );
+  Status = FindContextBufferInModuleBuffers (TestContext->HandlerGuid, 
TestContext->ContextBuffers, (CONST PRM_CONTEXT_BUFFER **));
   UT_ASSERT_STATUS_EQUAL (Status, TestContext->ExpectedStatus);
 
   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;
 
-  ContextBuffers