From nobody Sat Feb 7 07:10:12 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+95941+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+95941+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1667532679; cv=none; d=zohomail.com; s=zohoarc; b=JFRmulTgYjR+aXkujn0WL/GXwDRk2/2xasr9nhiCybm3C9D1PN//5RauTdO1CLtgWxQN76FZUlpUwsysVZ2nVpmUbonLf+Jl8H4t9qD6lw4aNc48NrdjRuQzJDunH5aZrHYv96Nc1hqV/uyaf0E1IS6Eap08l71DdFiSaTC50+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667532679; 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=jzUe5AI88phbcoQV2BBcGSywK+C+BpgWZhkES6w0gOY=; b=Cswe6SDDvcfG1ycEa41bhgGkRklhjhoUNOoqG2s39CV28cQJrWnG6vIjB/aWH9pbIv6Cn0UlrmGCguFEqDhXqMvOaf7pADTvT63IaBDOH2kEFYUGW+zcgWi1mH/Eh80SKRDdUMimTiADHilnVSP3VcN4mKyrz1UyTq/QHd9SF10= 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+95941+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 1667532679012438.4318807119108; Thu, 3 Nov 2022 20:31:19 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id eeFmYY1788612xpNStVZl6R3; Thu, 03 Nov 2022 20:31:18 -0700 X-Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web10.7390.1667532676726925714 for ; Thu, 03 Nov 2022 20:31:17 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10520"; a="290258026" X-IronPort-AV: E=Sophos;i="5.96,136,1665471600"; d="scan'208";a="290258026" X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2022 20:31:04 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10520"; a="809917951" X-IronPort-AV: E=Sophos;i="5.96,136,1665471600"; d="scan'208";a="809917951" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.2.81]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2022 20:31:03 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Liming Gao , Zhiguang Liu Subject: [edk2-devel] [Patch 2/7] MdePkg/Include/Library: Undefine _ASSERT() if already defined Date: Thu, 3 Nov 2022 20:30:51 -0700 Message-Id: <20221104033056.1259-3-michael.d.kinney@intel.com> In-Reply-To: <20221104033056.1259-1-michael.d.kinney@intel.com> References: <20221104033056.1259-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: 2tXHjGWwIF9PEHKEfWNDwcEAx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1667532678; bh=dccaMIInhIQ7wBKHFyb2jZbG6fVeAWx8luwd5tIZQ3U=; h=Cc:Date:From:Reply-To:Subject:To; b=cAXJVGpMUy7tv8iUi8sbkWuRaBT/lsttEjsMv4OBCWxql5tmVxQNwsJ2C3XsUErZhQE vKS72mEKdYmmwZS9Xsi8SdNecl6D9rtVFwPd66104x/0irzgghg+gYv3nOgB9sjxY1Alw cgumZzkw/4VM21cwZZxNEfyXZgLMZBUFvNk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1667532679552100001 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4134 When unit testing is enabled, make sure _ASSERT() is not already defined by the host environment before defining _ASSERT(). This avoids conflicts with VS20xx builds of GoogleTest based unit tests. Cc: Liming Gao Cc: Zhiguang Liu Signed-off-by: Michael D Kinney --- MdePkg/Include/Library/DebugLib.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/Deb= ugLib.h index 8d3d08638d73..9110be2f41b3 100644 --- a/MdePkg/Include/Library/DebugLib.h +++ b/MdePkg/Include/Library/DebugLib.h @@ -337,6 +337,9 @@ UnitTestDebugAssert ( IN CONST CHAR8 *Description ); =20 + #if defined (_ASSERT) + #undef _ASSERT + #endif #if defined (__clang__) && defined (__FILE_NAME__) #define _ASSERT(Expression) UnitTestDebugAssert (__FILE_NAME__, DEBUG_LIN= E_NUMBER, DEBUG_EXPRESSION_STRING (Expression)) #else --=20 2.37.1.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 (#95941): https://edk2.groups.io/g/devel/message/95941 Mute This Topic: https://groups.io/mt/94799426/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-