From nobody Mon Feb 9 23:01:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83302+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83302+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1635980413; cv=none; d=zohomail.com; s=zohoarc; b=PW8Cy7S4pe80d4/1SZzH1jrYWVpyM478b3G8A7/d+3Fqtw2RRnK+tZ/M3vm8WfZtgDmhHNR/858O6M2j4tzkDHB2gogFnxd/njheTwm9dhdtRlkfVU2OD9UIoXTM20Yea954dVwk5I3h/zDkFmV4+aRlwzzW7AfR5xF9FI8/xwg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635980413; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=OmdVCQnmqQzpH3FhVLA2gRz5skTNkSIOD0lq0uAP1Zo=; b=XnxRbqs8u7i+GQxAYzvogNksehizwpGqlKOICaJVYtQp/1QKohxF635kCtAjUXLaQ30C/4xQTlSKLMgWVehYXo7T4AL5m/DZbrxO/BB4hg6fvU9kTOCGY8+dfYFXC9DE00kaS1gt/SagkDAht9yNfAGH3F9GJ+7PlbF+qv7qxv0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83302+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635980413875477.1563290996929; Wed, 3 Nov 2021 16:00:13 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id im8iYY1788612x2b0xY2NrBf; Wed, 03 Nov 2021 16:00:13 -0700 X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web09.4277.1635980411005838808 for ; Wed, 03 Nov 2021 16:00:11 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10157"; a="229070030" X-IronPort-AV: E=Sophos;i="5.87,207,1631602800"; d="scan'208";a="229070030" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2021 16:00:10 -0700 X-IronPort-AV: E=Sophos;i="5.87,207,1631602800"; d="scan'208";a="729813081" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.88.80]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2021 16:00:10 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Hao A Wu , Liming Gao , Bret Barkelew , Philippe Mathieu-Daude Subject: [edk2-devel] [Patch V2 6/7] MdeModulePkg/Variable/RuntimeDxeUnitTest: Fix 32-bit GCC builds Date: Wed, 3 Nov 2021 15:59:53 -0700 Message-Id: <20211103225954.1680-7-michael.d.kinney@intel.com> In-Reply-To: <20211103225954.1680-1-michael.d.kinney@intel.com> References: <20211103225954.1680-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com X-Gm-Message-State: Py9RJoVlJ5Jue5VTobmBtvDDx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635980413; bh=DtnVJXynbFPU53PCnIVj+ryWtjFaXE6PKldME7SqpnA=; h=Cc:Date:From:Reply-To:Subject:To; b=GWOsv+CwOx8/gDIg7KAg5T5Qm7L4mTqxyZmEHMtT5t2BmMMoKIGlrYOOGBlKP/13q5o jehKeX73kXOPgLjeHXjhCLNzE3vW4b3ogEuWQ27olQOa/iJsTOJM6V0Wn2pniUdYgyxLh ERPS84uG+fBxpTuJWN6TAqhg0N2tV7WXbq0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635980414814100020 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Bret Barkelew Reviewed-by: Hao A Wu --- .../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/Runti= meDxe/RuntimeDxeUnitTest/VariableLockRequestToLockUnitTest.c index 44d70e639d77..880994fe71fc 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/RuntimeDxeUnitTest/Variabl= eLockRequestToLockUnitTest.c +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/RuntimeDxeUnitTest/Variabl= eLockRequestToLockUnitTest.c @@ -287,7 +287,7 @@ LockingAnUnlockedVariableShouldFail ( // With a policy, make sure that writes still work, since the variable d= oesn't exist. will_return( StubGetVariableNull, TEST_POLICY_ATTRIBUTES_NULL ); // A= ttributes will_return( StubGetVariableNull, 0 ); // S= ize - will_return( StubGetVariableNull, NULL ); // D= ataPtr + will_return( StubGetVariableNull, (UINTN)NULL ); // D= ataPtr will_return( StubGetVariableNull, EFI_NOT_FOUND); // S= tatus =20 Status =3D VariableLockRequestToLock (NULL, TEST_VAR_1_NAME, &mTestGuid1= ); @@ -342,7 +342,7 @@ LockingALockedVariableWithMatchingDataShouldSucceed ( Data =3D 1; will_return( StubGetVariableNull, TEST_POLICY_ATTRIBUTES_NULL ); // A= ttributes will_return( StubGetVariableNull, sizeof (Data) ); // S= ize - will_return( StubGetVariableNull, &Data ); // D= ataPtr + will_return( StubGetVariableNull, (UINTN)&Data ); // D= ataPtr will_return( StubGetVariableNull, EFI_SUCCESS); // S= tatus =20 Status =3D VariableLockRequestToLock (NULL, TEST_VAR_1_NAME, &mTestGuid1= ); @@ -397,7 +397,7 @@ LockingALockedVariableWithNonMatchingDataShouldFail ( Data =3D 2; will_return( StubGetVariableNull, TEST_POLICY_ATTRIBUTES_NULL ); // A= ttributes will_return( StubGetVariableNull, sizeof (Data) ); // S= ize - will_return( StubGetVariableNull, &Data ); // D= ataPtr + will_return( StubGetVariableNull, (UINTN)&Data ); // D= ataPtr will_return( StubGetVariableNull, EFI_SUCCESS); // S= tatus =20 Status =3D VariableLockRequestToLock (NULL, TEST_VAR_1_NAME, &mTestGuid1= ); --=20 2.32.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83302): https://edk2.groups.io/g/devel/message/83302 Mute This Topic: https://groups.io/mt/86804630/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-