Reviewed-by: Bret Barkelew - Bret From: Michael D Kinney Sent: Wednesday, November 3, 2021 4:00 PM To: devel@edk2.groups.io Cc: Hao A Wu; Liming Gao; Bret Barkelew; Philippe Mathieu-Daude Subject: [EXTERNAL] [Patch V2 6/7] MdeModulePkg/Variable/RuntimeDxeUnitTest: Fix 32-bit GCC builds When using will_return() on a pointer value, it must be cast to UINTN to be compatible with 32-bit GCC builds. This uses the same approach in samples provided in the UnitTestFramworkPkg when passing pointer values to UT_ASSERT_EQUAL(). Cc: Hao A Wu Cc: Liming Gao Cc: Bret Barkelew Signed-off-by: Michael D Kinney Reviewed-by: Philippe Mathieu-Daude --- .../RuntimeDxeUnitTest/VariableLockRequestToLockUnitTest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/RuntimeDxeUnitTest/VariableLockRequestToLockUnitTest.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/RuntimeDxeUnitTest/VariableLockRequestToLockUnitTest.c index 44d70e639d77..880994fe71fc 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/RuntimeDxeUnitTest/VariableLockRequestToLockUnitTest.c +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/RuntimeDxeUnitTest/VariableLockRequestToLockUnitTest.c @@ -287,7 +287,7 @@ LockingAnUnlockedVariableShouldFail ( // With a policy, make sure that writes still work, since the variable doesn't exist. will_return( StubGetVariableNull, TEST_POLICY_ATTRIBUTES_NULL ); // Attributes will_return( StubGetVariableNull, 0 ); // Size - will_return( StubGetVariableNull, NULL ); // DataPtr + will_return( StubGetVariableNull, (UINTN)NULL ); // DataPtr will_return( StubGetVariableNull, EFI_NOT_FOUND); // Status Status = VariableLockRequestToLock (NULL, TEST_VAR_1_NAME, &mTestGuid1); @@ -342,7 +342,7 @@ LockingALockedVariableWithMatchingDataShouldSucceed ( Data = 1; will_return( StubGetVariableNull, TEST_POLICY_ATTRIBUTES_NULL ); // Attributes will_return( StubGetVariableNull, sizeof (Data) ); // Size - will_return( StubGetVariableNull, &Data ); // DataPtr + will_return( StubGetVariableNull, (UINTN)&Data ); // DataPtr will_return( StubGetVariableNull, EFI_SUCCESS); // Status Status = VariableLockRequestToLock (NULL, TEST_VAR_1_NAME, &mTestGuid1); @@ -397,7 +397,7 @@ LockingALockedVariableWithNonMatchingDataShouldFail ( Data = 2; will_return( StubGetVariableNull, TEST_POLICY_ATTRIBUTES_NULL ); // Attributes will_return( StubGetVariableNull, sizeof (Data) ); // Size - will_return( StubGetVariableNull, &Data ); // DataPtr + will_return( StubGetVariableNull, (UINTN)&Data ); // DataPtr will_return( StubGetVariableNull, EFI_SUCCESS); // Status Status = VariableLockRequestToLock (NULL, TEST_VAR_1_NAME, &mTestGuid1); -- 2.32.0.windows.1