From nobody Mon Apr 29 13:16:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+41196+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+41196+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558509682; cv=none; d=zoho.com; s=zohoarc; b=AN6ypgfgziiP3M+A/VgUhEw2zufri3PqYI4icOZ/jA6pFEZiEatGf4HZSkZa+2UZ8q3IYcf+3uY0IhR6jr0d5hp78MudFwUjh8s3Kn5zhtu3/pc6P2frMJ2y3inL5g/w53y1dm59tZMV9LmZKVZSjgQOjwLElJFoeBqB8RfIm+A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558509682; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=GgVeHc07SuN4AvvxlPhVdKFjLUEH/9jzy6gFiyGzVqM=; b=SJMQLK7UoQly0HbsFl/7z7WHV4Qm8ZybYYQyRPbPmD0pEiRhExYAi92khqM4oHqkYqfTjE/62faZjZTS/jZhkRw5b4lRUcX4UdziFb2lg74C8hexPB6VxcGOvwDJLnZh4N5D1cISPW+QOOMe1oWL5sudau9b+OrqLGQhHYIhnZ0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+41196+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1558509682929121.15424060357839; Wed, 22 May 2019 00:21:22 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 22 May 2019 00:21:22 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 May 2019 00:21:21 -0700 X-ExtLoop1: 1 X-Received: from tiano-tengfens.ccr.corp.intel.com ([10.239.9.110]) by orsmga002.jf.intel.com with ESMTP; 22 May 2019 00:21:20 -0700 From: "Sun, Tengfen" To: devel@edk2.groups.io Cc: jiewen.yao@intel.com, liming.gao@intel.com, tengfen.sun@intel.com, chris.wu@intel.com Subject: [edk2-devel] [PATCH 1/4] [staging/HBFA PATCH]: CmockaHostUnitTestPkg: Add cmocka submodule. Date: Wed, 22 May 2019 15:20:41 +0800 Message-Id: <20190522072044.12472-2-tengfen.sun@intel.com> In-Reply-To: <20190522072044.12472-1-tengfen.sun@intel.com> References: <20190522072044.12472-1-tengfen.sun@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,tengfen.sun@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558509682; bh=4TDoNCcWD8i1t/H/IS/Kzlnq9wSmBUKpE0rK69BBers=; h=Cc:Date:From:Reply-To:Subject:To; b=vBYgIP2qk7NfUXvUAJ6q7y4wk2QR6Jqp1Hj3YGAKMgHdg7RvwOTcZw73DUJUCZt4KWV tDybuYVpX61K6m8bVI0+4jfWvDbhHRqeEJmx+o8dvcf++4eWLwLS3OUYYhhY6AnXXKA2d IY/RPMMLYVriBnfOBGPUykwCQ5tN+CVYciM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Add cmocka submodule to improve the current build process. REF: https://edk2.groups.io/g/devel/message/39893 Signed-off-by: Jiewen Yao Signed-off-by: Tengfen Sun --- .gitmodules | 3 +++ HBFA/CmockaHostUnitTestPkg/Library/CmockaLib/cmocka | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 HBFA/CmockaHostUnitTestPkg/Library/CmockaLib/cmocka diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000000..b85f2bd60241 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "HBFA/CmockaHostUnitTestPkg/Library/CmockaLib/cmocka"] + path =3D HBFA/CmockaHostUnitTestPkg/Library/CmockaLib/cmocka + url =3D https://git.cryptomilk.org/projects/cmocka.git diff --git a/HBFA/CmockaHostUnitTestPkg/Library/CmockaLib/cmocka b/HBFA/Cmo= ckaHostUnitTestPkg/Library/CmockaLib/cmocka new file mode 160000 index 000000000000..546bd5092424 --- /dev/null +++ b/HBFA/CmockaHostUnitTestPkg/Library/CmockaLib/cmocka @@ -0,0 +1 @@ +Subproject commit 546bd50924245f4ca7292a3ef6a92504aa375455 --=20 2.21.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 (#41196): https://edk2.groups.io/g/devel/message/41196 Mute This Topic: https://groups.io/mt/31717507/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- From nobody Mon Apr 29 13:16:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+41197+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+41197+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558509684; cv=none; d=zoho.com; s=zohoarc; b=hcuRRSGqxXluG6RJ+BhzwkJHKw1nyr3GPhS7WcGTHyXEzSl8so9Pne2jhPUH+wdz03jJ1L8y5nDfk9JfM9EOyqcJrsMT5Gxpf1ATrLsRpa7sHR73jDazVXRTzuTVpI41HlG73K4cFADQCq8XoA7jZ05zQLaTyhGkO0cZgge854Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558509684; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=iNRTPVouoKg0+GK6JR+wsROswm5M+p3kfUsepH29JmI=; b=Kw08IIau03BPjTCS6gUk1igAOQCcsTWumrR/wzWfFBCQ0xrGSLxEgzQZ/ClUqObQmCoeMyuyfjPIWF/9sZsiQr5XFspz6K7ncg8FKnBmUPqgT4bZ4j7M2L+BpS0O4rC8owgCn57Aaa9Z5vPo2EWr+lvLAOzK45CPrY71hs+sPJA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+41197+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1558509684452618.104312804056; Wed, 22 May 2019 00:21:24 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 22 May 2019 00:21:23 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 May 2019 00:21:23 -0700 X-ExtLoop1: 1 X-Received: from tiano-tengfens.ccr.corp.intel.com ([10.239.9.110]) by orsmga002.jf.intel.com with ESMTP; 22 May 2019 00:21:22 -0700 From: "Sun, Tengfen" To: devel@edk2.groups.io Cc: jiewen.yao@intel.com, liming.gao@intel.com, tengfen.sun@intel.com, chris.wu@intel.com Subject: [edk2-devel] [PATCH 2/4] [staging/HBFA PATCH]: CmockaHostUnitTestPkg: Enable CmockaHostUnitTestPkg build. Date: Wed, 22 May 2019 15:20:42 +0800 Message-Id: <20190522072044.12472-3-tengfen.sun@intel.com> In-Reply-To: <20190522072044.12472-1-tengfen.sun@intel.com> References: <20190522072044.12472-1-tengfen.sun@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,tengfen.sun@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558509684; bh=k6uKjnuOWB/u8ehUrZvekZtvAbOfyyWpT68y36kCALg=; h=Cc:Date:From:Reply-To:Subject:To; b=PhhQDke7e1/rv/JAJmRVOqsYE2R1zQV6JzubSAsLi0q5QIMOoDxhFkpsl+73S3EBtnB KYjVyB1tl6qGhOQJUvJiBAKN8DiQnaPXPy0c8A6RB+pE/U6/h4uzDz5zNz+g1q+N4seCb Y8+lU3K0npYA0BMDKYq6Hn7kyaf7RS54pPo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Enable build for CmockaHostUnitTestPkg with cmocka submodule. REF: https://edk2.groups.io/g/devel/message/39893 Signed-off-by: Tengfen Sun --- .../CmockaHostUnitTestPkg.dec | 16 +++++++++ .../CmockaHostUnitTestPkg.dsc | 22 +++++++++++++ .../Library/CmockaLib/CmockaLib.inf | 33 +++++++++++++++++++ .../Library/CmockaLib/CmockaLib.uni | 16 +++++++++ 4 files changed, 87 insertions(+) create mode 100644 HBFA/CmockaHostUnitTestPkg/CmockaHostUnitTestPkg.dec create mode 100644 HBFA/CmockaHostUnitTestPkg/CmockaHostUnitTestPkg.dsc create mode 100644 HBFA/CmockaHostUnitTestPkg/Library/CmockaLib/CmockaLib.= inf create mode 100644 HBFA/CmockaHostUnitTestPkg/Library/CmockaLib/CmockaLib.= uni diff --git a/HBFA/CmockaHostUnitTestPkg/CmockaHostUnitTestPkg.dec b/HBFA/Cm= ockaHostUnitTestPkg/CmockaHostUnitTestPkg.dec new file mode 100644 index 000000000000..85b41b1165d4 --- /dev/null +++ b/HBFA/CmockaHostUnitTestPkg/CmockaHostUnitTestPkg.dec @@ -0,0 +1,16 @@ +## @file CmockaHostUnitTestPkg.dec +# +# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[Defines] + DEC_SPECIFICATION =3D 0x00010005 + PACKAGE_NAME =3D CmockaHostUnitTestPkg + PACKAGE_GUID =3D 09566709-F1CA-4365-BB99-FC7869BE4E1C + PACKAGE_VERSION =3D 0.1 + +[Includes] + Library/CmockaLib/cmocka/include + Library/CmockaLib/cmocka/include/cmockery \ No newline at end of file diff --git a/HBFA/CmockaHostUnitTestPkg/CmockaHostUnitTestPkg.dsc b/HBFA/Cm= ockaHostUnitTestPkg/CmockaHostUnitTestPkg.dsc new file mode 100644 index 000000000000..27868fc5e050 --- /dev/null +++ b/HBFA/CmockaHostUnitTestPkg/CmockaHostUnitTestPkg.dsc @@ -0,0 +1,22 @@ +## @file CmockaHostUnitTestPkg.dsc +#=20 +# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[Defines] + PLATFORM_NAME =3D CmockaHostUnitTestPkg + PLATFORM_GUID =3D AD571B20-0E74-4513-AE17-E557079A9756 + PLATFORM_VERSION =3D 0.1 + DSC_SPECIFICATION =3D 0x00010005 + OUTPUT_DIRECTORY =3D Build/CmockaHostUnitTestPkg + SUPPORTED_ARCHITECTURES =3D IA32|X64 + BUILD_TARGETS =3D DEBUG|RELEASE + SKUID_IDENTIFIER =3D DEFAULT + +[LibraryClasses] + CmockaLib|CmockaHostUnitTestPkg/Library/CmockaLib/CmockaLib.inf + +[Components] + CmockaHostUnitTestPkg/Library/CmockaLib/CmockaLib.inf \ No newline at end of file diff --git a/HBFA/CmockaHostUnitTestPkg/Library/CmockaLib/CmockaLib.inf b/H= BFA/CmockaHostUnitTestPkg/Library/CmockaLib/CmockaLib.inf new file mode 100644 index 000000000000..dc9f48347625 --- /dev/null +++ b/HBFA/CmockaHostUnitTestPkg/Library/CmockaLib/CmockaLib.inf @@ -0,0 +1,33 @@ +## @file +# This module provides Cmocka Library implementation. +# +# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[Defines] + INF_VERSION =3D 0x00010005 + BASE_NAME =3D CmockaLib + MODULE_UNI_FILE =3D CmockaLib.uni + FILE_GUID =3D F1662152-3399-49AC-BE44-CAA97575FACE + MODULE_TYPE =3D BASE + VERSION_STRING =3D 0.1 + LIBRARY_CLASS =3D CmockaLib + DEFINE CMOCKA_PATH =3D cmocka + +# +# VALID_ARCHITECTURES =3D IA32 X64 ARM AARCH64 +# + +[Sources] + $(CMOCKA_PATH)/src/cmocka.c + =20 +[Packages] + CmockaHostUnitTestPkg/CmockaHostUnitTestPkg.dec + =20 +[BuildOptions] + MSFT:*_*_*_CC_FLAGS =3D=3D /c /D _CRT_SECURE_CPP_OVERLOAD_STANDARD= _NAMES=3D1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=3D1 /D _CRT_NON= STDC_NO_WARNINGS=3D1 /D _CRT_SECURE_NO_WARNINGS=3D1 -DHAVE_VSNPRINTF -DHAVE= _SNPRINTF + + GCC:*_*_IA32_CC_FLAGS =3D=3D -m32 -O0 -g -fprofile-arcs -ftest-covera= ge -std=3Dgnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align= -Werror=3Daddress -Wstrict-prototypes -Werror=3Dstrict-prototypes -Wwrite-= strings -Werror=3Dwrite-strings -Werror-implicit-function-declaration -Wpoi= nter-arith -Werror=3Dpointer-arith -Wdeclaration-after-statement -Werror=3D= declaration-after-statement -Wreturn-type -Werror=3Dreturn-type -Wuninitial= ized -Werror=3Duninitialized -Werror=3Dstrict-overflow -Wstrict-overflow=3D= 2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security -W= error=3Dformat-security -fno-common -Wformat -fno-common -fstack-protector-= strong -DHAVE_SIGNAL_H + GCC:*_*_X64_CC_FLAGS =3D=3D -m64 -O0 -g -fprofile-arcs -ftest-covera= ge -std=3Dgnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align= -Werror=3Daddress -Wstrict-prototypes -Werror=3Dstrict-prototypes -Wwrite-= strings -Werror=3Dwrite-strings -Werror-implicit-function-declaration -Wpoi= nter-arith -Werror=3Dpointer-arith -Wdeclaration-after-statement -Werror=3D= declaration-after-statement -Wreturn-type -Werror=3Dreturn-type -Wuninitial= ized -Werror=3Duninitialized -Werror=3Dstrict-overflow -Wstrict-overflow=3D= 2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security -W= error=3Dformat-security -fno-common -Wformat -fno-common -fstack-protector-= strong -DHAVE_SIGNAL_H diff --git a/HBFA/CmockaHostUnitTestPkg/Library/CmockaLib/CmockaLib.uni b/H= BFA/CmockaHostUnitTestPkg/Library/CmockaLib/CmockaLib.uni new file mode 100644 index 000000000000..5a114b934554 --- /dev/null +++ b/HBFA/CmockaHostUnitTestPkg/Library/CmockaLib/CmockaLib.uni @@ -0,0 +1,16 @@ +// /** @file +// This module provides Cmocka Library implementation. +// +// This module provides Cmocka Library implementation. +// +// Copyright (c) 2019, Intel Corporation. All rights reserved.
+// +// SPDX-License-Identifier: BSD-2-Clause-Patent +// +// **/ + + +#string STR_MODULE_ABSTRACT #language en-US "Cmocka Library im= plementation" + +#string STR_MODULE_DESCRIPTION #language en-US "This module provi= des Cmocka Library implementation." + --=20 2.21.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 (#41197): https://edk2.groups.io/g/devel/message/41197 Mute This Topic: https://groups.io/mt/31717508/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- From nobody Mon Apr 29 13:16:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+41198+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+41198+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558509686; cv=none; d=zoho.com; s=zohoarc; b=SQuT1yo9F0tQhfGLksJ9nJHsrEyXUB4Uk93v/nBt+9OaKoEk0/4QU+XJzIfnyWMXJIhyyCev0cDrsfYiydXWOk1RRazAbiGGR5hwrb6aKK/YWOEpts6w/SjM1Lud+FP4BA0Igs2HUW21rs4D9w4QGpd/jJJZsiS5j8eY6Kj9GyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558509686; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=jr6tGZt9KvTIOeQ8iNiwSaBCfIWViVNXxBzmLgSbRlQ=; b=Dib343Jm0q7QH2YNcno8Ns/l9w/m3kvXiWj549fCAvWtRvWXqK+s+j6Y0AJrHKOUSOgQ98Y2iHXXaY5cTLXymX32MibOcrSmQq8l8l73gRJyRETCGnaEy/YEC2UCHUMsk0ELiJaF5SbsjOnY/iYvZ491O9kJUHbSsczgCKdXXVU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+41198+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1558509686149569.5641090178206; Wed, 22 May 2019 00:21:26 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 22 May 2019 00:21:25 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 May 2019 00:21:25 -0700 X-ExtLoop1: 1 X-Received: from tiano-tengfens.ccr.corp.intel.com ([10.239.9.110]) by orsmga002.jf.intel.com with ESMTP; 22 May 2019 00:21:23 -0700 From: "Sun, Tengfen" To: devel@edk2.groups.io Cc: jiewen.yao@intel.com, liming.gao@intel.com, tengfen.sun@intel.com, chris.wu@intel.com Subject: [edk2-devel] [PATCH 3/4] [staging/HBFA PATCH]: UefiHostUnitTestCasePkg: Add CmockaLib Date: Wed, 22 May 2019 15:20:43 +0800 Message-Id: <20190522072044.12472-4-tengfen.sun@intel.com> In-Reply-To: <20190522072044.12472-1-tengfen.sun@intel.com> References: <20190522072044.12472-1-tengfen.sun@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,tengfen.sun@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558509685; bh=XBmesX97wjl0fmsdJzdsyKqzkrwfYD9r7eUB8hWFnH0=; h=Cc:Date:From:Reply-To:Subject:To; b=q2pDHuXo51Y/ZKJvb1MYaQ+E3hNlwN8lyYxPnWipdcd4IAVcAvIADWChEvtA8bAkHWp yUypO9hbkP/8n0Cqt/g3VcTabq3Es+lF7eTucBrFneNbLupcyGDJy1CIuvxJ3aLE87RAB P+8ZjaujDOR473a8WxOj3jjcbaGpVzZYFd8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Add CmockaLib into UefiHostUnitTestCasePkg.dsc REF: https://edk2.groups.io/g/devel/message/39893 Signed-off-by: Tengfen Sun --- .../UefiHostUnitTestCasePkg.dsc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/HBFA/UefiHostUnitTestCasePkg/UefiHostUnitTestCasePkg.dsc b/HBF= A/UefiHostUnitTestCasePkg/UefiHostUnitTestCasePkg.dsc index d116062eb2d3..8fe1f5b76b7b 100644 --- a/HBFA/UefiHostUnitTestCasePkg/UefiHostUnitTestCasePkg.dsc +++ b/HBFA/UefiHostUnitTestCasePkg/UefiHostUnitTestCasePkg.dsc @@ -99,6 +99,7 @@ !if $(UNIT_TEST_FRAMEWORK_MODE) =3D=3D CMOCKA UnitTestLib|UefiHostUnitTestPkg/Library/UnitTestLibcmocka/UnitTestLibcmo= cka.inf UnitTestAssertLib|UefiHostUnitTestPkg/Library/UnitTestAssertLibcmocka/Un= itTestAssertLibcmocka.inf + CmockaLib|CmockaHostUnitTestPkg/Library/CmockaLib/CmockaLib.inf !endif =20 !if $(OPENSSL_TEST_ENABLE) @@ -181,6 +182,16 @@ !endif =20 [Components] +!if $(UNIT_TEST_FRAMEWORK_MODE) =3D=3D CMOCKA + CmockaHostUnitTestPkg/Library/CmockaLib/CmockaLib.inf { + + MSFT:*_*_*_CC_FLAGS =3D=3D /c /D _CRT_SECURE_CPP_OVERLOAD_STANDA= RD_NAMES=3D1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=3D1 /D _CRT_N= ONSTDC_NO_WARNINGS=3D1 /D _CRT_SECURE_NO_WARNINGS=3D1 -DHAVE_VSNPRINTF -DHA= VE_SNPRINTF + =20 + GCC:*_*_IA32_CC_FLAGS =3D=3D -m32 -O0 -g -fprofile-arcs -ftest-cove= rage -std=3Dgnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-ali= gn -Werror=3Daddress -Wstrict-prototypes -Werror=3Dstrict-prototypes -Wwrit= e-strings -Werror=3Dwrite-strings -Werror-implicit-function-declaration -Wp= ointer-arith -Werror=3Dpointer-arith -Wdeclaration-after-statement -Werror= =3Ddeclaration-after-statement -Wreturn-type -Werror=3Dreturn-type -Wuninit= ialized -Werror=3Duninitialized -Werror=3Dstrict-overflow -Wstrict-overflow= =3D2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security= -Werror=3Dformat-security -fno-common -Wformat -fno-common -fstack-protect= or-strong -DHAVE_SIGNAL_H + GCC:*_*_X64_CC_FLAGS =3D=3D -m64 -O0 -g -fprofile-arcs -ftest-cove= rage -std=3Dgnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-ali= gn -Werror=3Daddress -Wstrict-prototypes -Werror=3Dstrict-prototypes -Wwrit= e-strings -Werror=3Dwrite-strings -Werror-implicit-function-declaration -Wp= ointer-arith -Werror=3Dpointer-arith -Wdeclaration-after-statement -Werror= =3Ddeclaration-after-statement -Wreturn-type -Werror=3Dreturn-type -Wuninit= ialized -Werror=3Duninitialized -Werror=3Dstrict-overflow -Wstrict-overflow= =3D2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security= -Werror=3Dformat-security -fno-common -Wformat -fno-common -fstack-protect= or-strong -DHAVE_SIGNAL_H + } +!endif + UefiHostUnitTestCasePkg/TestCase/FatPkg/FatPei/TestPeiGpt.inf { NULL|UefiHostUnitTestCasePkg/TestCase/FatPkg/FatPei/Override/FatPei.inf --=20 2.21.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 (#41198): https://edk2.groups.io/g/devel/message/41198 Mute This Topic: https://groups.io/mt/31717509/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- From nobody Mon Apr 29 13:16:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+41199+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+41199+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558509687; cv=none; d=zoho.com; s=zohoarc; b=IpfuNfrPXj5H/qDezbekVm5vWJ5LtJ6KosjqhUFZWwhJZYmVTFHibprM5RXcG0oEgJ0NNRcXr0IY9SnYMDPxtd0cMV0UgkkQpzIoW0ZITiBN/SQ4JHXcdyByfILrVpF+vkLg196whsuAXw0JETPgnxB8sk+QXc6AJmQ2m0U8tS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558509687; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=93UVzEkHcn90f7EegH0IgayyjKnyRfzQ91gzGVvMlnQ=; b=CbIe1tMgFbPE+wXrEvgDeGZwcp21UkPUITvx1icPYlzFtwNpOCosqxXWLUrc8oqsqT097hHy+Q8sUKli9wk5Qh2Kh+NcqLDFAlZ+Inm8KcD2zia+5exeWlF6qXZDGCopnriPkWs96Wn+1VN0Li7Fp2lfJTb5n8DUiR4KX6qs0/Q= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+41199+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1558509687687985.5810037762631; Wed, 22 May 2019 00:21:27 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 22 May 2019 00:21:27 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 May 2019 00:21:26 -0700 X-ExtLoop1: 1 X-Received: from tiano-tengfens.ccr.corp.intel.com ([10.239.9.110]) by orsmga002.jf.intel.com with ESMTP; 22 May 2019 00:21:25 -0700 From: "Sun, Tengfen" To: devel@edk2.groups.io Cc: jiewen.yao@intel.com, liming.gao@intel.com, tengfen.sun@intel.com, chris.wu@intel.com Subject: [edk2-devel] [PATCH 4/4] [staging/HBFA PATCH]: UefiHostUnitTestPkg: Enable cmocka unit test build with CmockaHostUnitTestPkg Date: Wed, 22 May 2019 15:20:44 +0800 Message-Id: <20190522072044.12472-5-tengfen.sun@intel.com> In-Reply-To: <20190522072044.12472-1-tengfen.sun@intel.com> References: <20190522072044.12472-1-tengfen.sun@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,tengfen.sun@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558509687; bh=3tfELpginkvdQi9lWyZHAzCX6yOVNITldIZty9V5k38=; h=Cc:Date:From:Reply-To:Subject:To; b=jiPNuY21cGLkiSG/TPs9VmrdwyDhvc1Vyycisc+zj1doKIrbpeuKlnsAyllaVZ3z4/h GiYRML6WwdJEDolGCHFqJuS34ZVTOcN/H5l8jeP2YteY+4ha0sfRWtUnTrvVXwJHIDGgZ pkuBcLCZhYFNcxqYmV9MQgDqys7BCP35zKk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" In order to improve the current build process, enable cmocka unit test buil= d with CmockaHostUnitTestPkg. REF: https://edk2.groups.io/g/devel/message/39893 Signed-off-by: Tengfen Sun --- .../UnitTestAssertLibcmocka.inf | 4 +- .../UnitTestLibcmocka/UnitTestLibcmocka.inf | 2 + HBFA/UefiHostUnitTestPkg/ReadMe-cmocka.txt | 85 ++++--------------- .../SampleUnitTestcmocka.inf | 2 + .../UefiHostUnitTestBuildOption.dsc | 40 +++------ .../UefiHostUnitTestPkg.dsc | 8 ++ 6 files changed, 44 insertions(+), 97 deletions(-) diff --git a/HBFA/UefiHostUnitTestPkg/Library/UnitTestAssertLibcmocka/UnitT= estAssertLibcmocka.inf b/HBFA/UefiHostUnitTestPkg/Library/UnitTestAssertLib= cmocka/UnitTestAssertLibcmocka.inf index ef780e1fb0db..fd6098a3136b 100644 --- a/HBFA/UefiHostUnitTestPkg/Library/UnitTestAssertLibcmocka/UnitTestAsse= rtLibcmocka.inf +++ b/HBFA/UefiHostUnitTestPkg/Library/UnitTestAssertLibcmocka/UnitTestAsse= rtLibcmocka.inf @@ -15,11 +15,13 @@ =20 [LibraryClasses] BaseMemoryLib + CmockaLib =20 [Packages] MdePkg/MdePkg.dec UnitTestPkg/UnitTestPkg.dec UefiHostUnitTestPkg/UefiHostUnitTestPkg.dec - + CmockaHostUnitTestPkg/CmockaHostUnitTestPkg.dec + =20 [Sources] UnitTestAssertLib.c diff --git a/HBFA/UefiHostUnitTestPkg/Library/UnitTestLibcmocka/UnitTestLib= cmocka.inf b/HBFA/UefiHostUnitTestPkg/Library/UnitTestLibcmocka/UnitTestLib= cmocka.inf index 376c57d33fac..68bd26c4b7db 100644 --- a/HBFA/UefiHostUnitTestPkg/Library/UnitTestLibcmocka/UnitTestLibcmocka.= inf +++ b/HBFA/UefiHostUnitTestPkg/Library/UnitTestLibcmocka/UnitTestLibcmocka.= inf @@ -17,12 +17,14 @@ BaseLib MemoryAllocationLib OsServiceLib + CmockaLib =20 [Packages] MdePkg/MdePkg.dec UnitTestPkg/UnitTestPkg.dec UefiHostTestPkg/UefiHostTestPkg.dec UefiHostUnitTestPkg/UefiHostUnitTestPkg.dec + CmockaHostUnitTestPkg/CmockaHostUnitTestPkg.dec =20 [Sources] UnitTestLib.c diff --git a/HBFA/UefiHostUnitTestPkg/ReadMe-cmocka.txt b/HBFA/UefiHostUnit= TestPkg/ReadMe-cmocka.txt index b1d3781ba5fc..f4b8d51f3058 100644 --- a/HBFA/UefiHostUnitTestPkg/ReadMe-cmocka.txt +++ b/HBFA/UefiHostUnitTestPkg/ReadMe-cmocka.txt @@ -1,77 +1,26 @@ How to run cmocka for UEFI code. =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D -0) download CMake (http://www.cmake.org/) - -1) install cmocka-1.1.5 -Part A: Install cmocka in linux -1.1 download cmocka-1.1.5.tar.xz (https://cmocka.org/) and unzip it ($tar = xJvf cmocka-1.1.5.tar.xz) -1.2 build - $ cd cmocka-1.1.5 - $ mkdir build - $ cd build - $ export CFLAGS=3D-m32 - $ export CXXFLAGS=3D-m32 - $ cmake -DCMAKE_INSTALL_PREFIX=3D/usr -DCMAKE_BUILD_TYPE=3DDebug -D WITH= _STATIC_LIB=3DON .. - $ make - $ sudo sh -c "echo '<...>/cmocka-1.1.5/build/src' >> /etc/ld.so.conf" - $ sudo ldconfig=20 - $ cd .. - $ mkdir build64 - $ cd build64 - $ export CFLAGS=3D-m64 - $ export CXXFLAGS=3D-m64 - $ cmake -DCMAKE_INSTALL_PREFIX=3D/usr -DCMAKE_BUILD_TYPE=3DDebug -D WITH= _STATIC_LIB=3DON .. - $ make - $ sudo sh -c "echo '<...>/cmocka-1.1.5/build64/src' >> /etc/ld.so.conf" - $ sudo ldconfig=20 - - the lib is at ./src/libcmocka-static.a, ./src/libcmocka.so - -1.3 export CMOCKA_INC_PATH=3D<...>/cmocka-1.1.5/include - export CMOCKA_LIB_PATH=3D<...>/cmocka-1.1.5/build/src - export CMOCKA_LIB_PATH_64=3D<...>/cmocka-1.1.5/build64/src - export CMOCKA_LIB_NAME=3Dcmocka[-static] - export CMOCKA_LIB_NAME_64=3Dcmocka[-static] - -Part B: Install cmocka in windows -1.1 download cmocka-1.1.5 from https://cmocka.org/, and unzip cmocka-1.1.5= .tar.xz -1.2 open visual studio dev command prompt, to go=20 - cd <...>\cmocka-1.1.5\ - mkdir build - cd build - cmake -G "Visual Studio 14 2015" -D WITH_STATIC_LIB=3DON .. - - mkdir build64 - cd build64 - cmake -G "Visual Studio 14 2015 Win64" -D WITH_STATIC_LIB=3DON .. - -1.3 load solution at cmocka.sln, and build the solution. - or type: - devenv cmocka.sln /Build [Debug|Release] /Project cmocka[-static] - - static lib can be found at: - cmocka-1.1.5\[build|build64]\src\[Debug|Release]\cmocka-static.lib - - dynamic lib can be found at:=20 - cmocka-1.1.5\[build|build64]\src\[Debug|Release]\cmocka.[lib|dll] - -1.4 set CMOCKA_INC_PATH=3D<...>\cmocka-1.1.5\include - set CMOCKA_LIB_PATH=3D<...>\cmocka-1.1.5\build\src\[Debug|Release] - set CMOCKA_LIB_PATH_64=3D<...>\cmocka-1.1.5\build64\src\[Debug|Release] - set CMOCKA_LIB_NAME=3Dcmocka[-static].lib - set CMOCKA_LIB_NAME_64=3Dcmocka[-static].lib - -1.5 add env path, only for dynamic lib build - Add %CMOCKA_LIB_PATH% to %PATH%, for IA32 run. - Add %CMOCKA_LIB_PATH_64% to %PATH%, for X64 run. +1) install cmocka + Cmocka repository was added as one submodule of HBFA project. + The user can use the following commands to clone both main HBFA repo and= Cmocka submodule: + Add the "--recursive" flag to the git clone command: + $ git clone --recursive +or + Manually initialize and update the submodules after the clone operation = on main project: + $ git clone + $ git submodule update --init --recursive + + And use the following combined commands to pull the remote submodule upd= ates +(e.g. Updating the new supported Cmocka release tag): + $ git pull --recurse-submodules && git submodule update --recursive =20 2) run sample code (Basic Mode) Part A: Build in Linux - build -p UefiHostUnitTestCasePkg/UefiHostUnitTestCasePkg.dsc -a X64 -t= GCC5 -DUNIT_TEST_FRAMEWORK_MODE=3DCMOCKA --disable-include-path-check + build -p UefiHostUnitTestCasePkg/UefiHostUnitTestCasePkg.dsc -a X64 -t= GCC5 -DUNIT_TEST_FRAMEWORK_MODE=3DCMOCKA <...>/Build/UefiHostUnitTestCasePkg/DEBUG_GCC5/X64/TestBaseSafeIntLib =20 Part B: Build in Windows - build -p UefiHostUnitTestCasePkg\UefiHostUnitTestCasePkg.dsc -a X64 -t= VS2015x86 -DUNIT_TEST_FRAMEWORK_MODE=3DCMOCKA --disable-include-path-check + build -p UefiHostUnitTestCasePkg\UefiHostUnitTestCasePkg.dsc -a X64 -t= VS2015x86 -DUNIT_TEST_FRAMEWORK_MODE=3DCMOCKA <...>\Build\UefiHostUnitTestCasePkg\DEBUG_VS2015x86\X64\TestBaseSafeIn= tLib.exe =20 =20 You may see below. Have fun @@ -108,12 +57,12 @@ Int Safe Lib Unit Test Application v0.1 set environment variable: CMOCKA_XML_FILE=3D =20 Build in Linux - build -p UefiHostUnitTestCasePkg/UefiHostUnitTestCasePkg.dsc -a X64 -t= GCC5 -DUNIT_TEST_FRAMEWORK_MODE=3DCMOCKA -DUNIT_TEST_XML_MODE --disable-in= clude-path-check + build -p UefiHostUnitTestCasePkg/UefiHostUnitTestCasePkg.dsc -a X64 -t= GCC5 -DUNIT_TEST_FRAMEWORK_MODE=3DCMOCKA -DUNIT_TEST_XML_MODE export CMOCKA_XML_FILE=3DTestBaseSafeIntLib.X64.xml ./Build/UefiHostUnitTestCasePkg/DEBUG_GCC5/X64/TestBaseSafeIntLib =20 Build in Windows - build -p UefiHostUnitTestCasePkg/UefiHostUnitTestCasePkg.dsc -a X64 -t= VS2015x86 -DUNIT_TEST_FRAMEWORK_MODE=3DCMOCKA -DUNIT_TEST_XML_MODE --disab= le-include-path-check + build -p UefiHostUnitTestCasePkg/UefiHostUnitTestCasePkg.dsc -a X64 -t= VS2015x86 -DUNIT_TEST_FRAMEWORK_MODE=3DCMOCKA -DUNIT_TEST_XML_MODE set CMOCKA_XML_FILE=3DTestBaseSafeIntLib.X64.xml <...>\Build\UefiHostUnitTestCasePkg\DEBUG_VS2015x86\X64\TestBaseSafeIn= tLib.exe =20 diff --git a/HBFA/UefiHostUnitTestPkg/Sample/SampleUnitTestcmocka/SampleUni= tTestcmocka.inf b/HBFA/UefiHostUnitTestPkg/Sample/SampleUnitTestcmocka/Samp= leUnitTestcmocka.inf index 5c7fb45b3dd6..f33c0b612acf 100644 --- a/HBFA/UefiHostUnitTestPkg/Sample/SampleUnitTestcmocka/SampleUnitTestcm= ocka.inf +++ b/HBFA/UefiHostUnitTestPkg/Sample/SampleUnitTestcmocka/SampleUnitTestcm= ocka.inf @@ -23,6 +23,7 @@ MdePkg/MdePkg.dec UnitTestPkg/UnitTestPkg.dec UefiHostUnitTestPkg/UefiHostUnitTestPkg.dec + CmockaHostUnitTestPkg/CmockaHostUnitTestPkg.dec =20 [Protocols] =20 @@ -33,6 +34,7 @@ UnitTestLib UnitTestAssertLib PrintLib + CmockaLib =20 [Guids] =20 diff --git a/HBFA/UefiHostUnitTestPkg/UefiHostUnitTestBuildOption.dsc b/HBF= A/UefiHostUnitTestPkg/UefiHostUnitTestBuildOption.dsc index 74450f03a935..2835741e2ef7 100644 --- a/HBFA/UefiHostUnitTestPkg/UefiHostUnitTestBuildOption.dsc +++ b/HBFA/UefiHostUnitTestPkg/UefiHostUnitTestBuildOption.dsc @@ -25,10 +25,6 @@ GCC:*_*_*_CC_FLAGS =3D -I"$(CUNIT_INC_PATH)" !endif =20 -!if $(UNIT_TEST_FRAMEWORK_MODE) =3D=3D CMOCKA - GCC:*_*_*_CC_FLAGS =3D -I"$(CMOCKA_INC_PATH)" -!endif - MSFT:*_*_IA32_CC_FLAGS =3D=3D /nologo /W4 /WX /Gy /c /D UNICODE /Od /FIA= utoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SEC= URE_NO_DEPRECATE /DHOST_DEBUG_MESSAGE=3D1 MSFT:*_*_X64_CC_FLAGS =3D=3D /nologo /W4 /WX /Gy /c /D UNICODE /Od /FIAu= toGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECU= RE_NO_DEPRECATE /DHOST_DEBUG_MESSAGE=3D1 MSFT:DEBUG_*_*_CC_FLAGS =3D /Od /GL- @@ -37,10 +33,6 @@ MSFT:*_*_*_CC_FLAGS =3D /I"%CUNIT_INC_PATH%" !endif =20 -!if $(UNIT_TEST_FRAMEWORK_MODE) =3D=3D CMOCKA - MSFT:*_*_*_CC_FLAGS =3D /I"%CMOCKA_INC_PATH%" -!endif - [BuildOptions.common.EDKII.USER_DEFINED] MSFT:*_*_IA32_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).e= xe" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"$(VCINSTA= LLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /LIBPATH:"%Universal= CRTSdkDir%lib\%UCRTVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%Windows= SDKLibVersion%\um\x86" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:408= 6 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.l= ib User32.lib Winmm.lib Advapi32.lib MSFT:*_VS2015_IA32_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).e= xe" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"$(VCINSTA= LLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /LIBPATH:"%Universal= CRTSdkDir%lib\%UCRTVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%Windows= SDKLibVersion%\um\x86" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:408= 6 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib vcrunti= med.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib Advapi32.lib @@ -55,10 +47,10 @@ !endif =20 !if $(UNIT_TEST_FRAMEWORK_MODE) =3D=3D CMOCKA - MSFT:*_*_IA32_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).e= xe" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"$(VCINSTA= LLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /LIBPATH:"%Universal= CRTSdkDir%lib\%UCRTVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%Windows= SDKLibVersion%\um\x86" /LIBPATH:"%CMOCKA_LIB_PATH%" /NOLOGO /SUBSYSTEM:CONS= OLE /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVC= RTD.lib Gdi32.lib User32.lib Winmm.lib Advapi32.lib %CMOCKA_LIB_NAME% - MSFT:*_VS2015_IA32_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).e= xe" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"$(VCINSTA= LLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /LIBPATH:"%Universal= CRTSdkDir%lib\%UCRTVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%Windows= SDKLibVersion%\um\x86" /LIBPATH:"%CMOCKA_LIB_PATH%" /NOLOGO /SUBSYSTEM:CONS= OLE /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVC= RTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib Advapi32.li= b %CMOCKA_LIB_NAME% - MSFT:*_VS2015x86_IA32_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).e= xe" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"$(VCINSTA= LLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /LIBPATH:"%Universal= CRTSdkDir%lib\%UCRTVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%Windows= SDKLibVersion%\um\x86" /LIBPATH:"%CMOCKA_LIB_PATH%" /NOLOGO /SUBSYSTEM:CONS= OLE /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVC= RTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib Advapi32.li= b %CMOCKA_LIB_NAME% - MSFT:*_VS2017_IA32_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).e= xe" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"%VCToolsI= nstallDir%lib\x86" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x86= " /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x86" /NOLOGO /SUBS= YSTEM:CONSOLE /LIBPATH:"%CMOCKA_LIB_PATH%" /IGNORE:4086 /MAP /OPT:REF /DEBU= G /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi= 32.lib User32.lib Winmm.lib Advapi32.lib %CMOCKA_LIB_NAME% + MSFT:*_*_IA32_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).e= xe" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"$(VCINSTA= LLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /LIBPATH:"%Universal= CRTSdkDir%lib\%UCRTVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%Windows= SDKLibVersion%\um\x86" /NOLOGO /SUBSYSTEM:CONSOLE /IGNORE:4086 /MAP /OPT:RE= F /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib = Winmm.lib Advapi32.lib + MSFT:*_VS2015_IA32_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).e= xe" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"$(VCINSTA= LLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /LIBPATH:"%Universal= CRTSdkDir%lib\%UCRTVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%Windows= SDKLibVersion%\um\x86" /NOLOGO /SUBSYSTEM:CONSOLE /IGNORE:4086 /MAP /OPT:RE= F /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib vcruntimed.lib ucrtd.= lib Gdi32.lib User32.lib Winmm.lib Advapi32.lib + MSFT:*_VS2015x86_IA32_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).e= xe" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"$(VCINSTA= LLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /LIBPATH:"%Universal= CRTSdkDir%lib\%UCRTVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%Windows= SDKLibVersion%\um\x86" /NOLOGO /SUBSYSTEM:CONSOLE /IGNORE:4086 /MAP /OPT:RE= F /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib vcruntimed.lib ucrtd.= lib Gdi32.lib User32.lib Winmm.lib Advapi32.lib + MSFT:*_VS2017_IA32_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).e= xe" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"%VCToolsI= nstallDir%lib\x86" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x86= " /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x86" /NOLOGO /SUBS= YSTEM:CONSOLE /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel3= 2.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib A= dvapi32.lib !endif =20 MSFT:*_*_IA32_CC_FLAGS =3D=3D /nologo /W4 /WX /Gy /c /D UNICODE /Od /FIA= utoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SEC= URE_NO_DEPRECATE @@ -79,10 +71,10 @@ !endif =20 !if $(UNIT_TEST_FRAMEWORK_MODE) =3D=3D CMOCKA - MSFT:*_*_X64_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).ex= e" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"$(VCINSTAL= LDIR)\Lib\AMD64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" = /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /LIBPATH:"%CMOC= KA_LIB_PATH_64%" /NOLOGO /SUBSYSTEM:CONSOLE /IGNORE:4086 /MAP /OPT:REF /DEB= UG /MACHINE:AMD64 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm= .lib Advapi32.lib %CMOCKA_LIB_NAME_64% - MSFT:*_VS2015_X64_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).ex= e" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"$(VCINSTAL= LDIR)\Lib\AMD64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" = /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /LIBPATH:"%CMOC= KA_LIB_PATH_64%" /NOLOGO /SUBSYSTEM:CONSOLE /IGNORE:4086 /MAP /OPT:REF /DEB= UG /MACHINE:AMD64 /LTCG Kernel32.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib G= di32.lib User32.lib Winmm.lib Advapi32.lib %CMOCKA_LIB_NAME_64% - MSFT:*_VS2015x86_X64_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).ex= e" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"$(VCINSTAL= LDIR)\Lib\AMD64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" = /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /LIBPATH:"%CMOC= KA_LIB_PATH_64%" /NOLOGO /SUBSYSTEM:CONSOLE /IGNORE:4086 /MAP /OPT:REF /DEB= UG /MACHINE:AMD64 /LTCG Kernel32.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib G= di32.lib User32.lib Winmm.lib Advapi32.lib %CMOCKA_LIB_NAME_64% - MSFT:*_VS2017_X64_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).ex= e" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"%VCToolsIn= stallDir%lib\x64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64"= /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /LIBPATH:"%CMO= CKA_LIB_PATH_64%" /NOLOGO /SUBSYSTEM:CONSOLE /IGNORE:4086 /MAP /OPT:REF /DE= BUG /MACHINE:AMD64 /LTCG Kernel32.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib = Gdi32.lib User32.lib Winmm.lib Advapi32.lib %CMOCKA_LIB_NAME_64% + MSFT:*_*_X64_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).ex= e" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"$(VCINSTAL= LDIR)\Lib\AMD64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" = /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /NOLOGO /SUBSYS= TEM:CONSOLE /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:AMD64 /LTCG Kernel32= .lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib Advapi32.lib + MSFT:*_VS2015_X64_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).ex= e" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"$(VCINSTAL= LDIR)\Lib\AMD64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" = /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /NOLOGO /SUBSYS= TEM:CONSOLE /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:AMD64 /LTCG Kernel32= .lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib Ad= vapi32.lib + MSFT:*_VS2015x86_X64_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).ex= e" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"$(VCINSTAL= LDIR)\Lib\AMD64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" = /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /NOLOGO /SUBSYS= TEM:CONSOLE /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:AMD64 /LTCG Kernel32= .lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib Ad= vapi32.lib + MSFT:*_VS2017_X64_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).ex= e" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"%VCToolsIn= stallDir%lib\x64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64"= /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /NOLOGO /SUBSY= STEM:CONSOLE /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:AMD64 /LTCG Kernel3= 2.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib A= dvapi32.lib !endif =20 MSFT:*_*_X64_CC_FLAGS =3D=3D /nologo /W4 /WX /Gy /c /D UNICODE /Od /FIAu= toGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECU= RE_NO_DEPRECATE @@ -95,10 +87,6 @@ MSFT:*_*_*_CC_FLAGS =3D /I"%CUNIT_INC_PATH%" !endif =20 -!if $(UNIT_TEST_FRAMEWORK_MODE) =3D=3D CMOCKA - MSFT:*_*_*_CC_FLAGS =3D /I"%CMOCKA_INC_PATH%" -!endif - GCC:*_*_IA32_DLINK_FLAGS =3D=3D -o $(BIN_DIR)/$(BASE_NAME) -m32 -L/usr/X= 11R6/lib GCC:*_*_IA32_CC_FLAGS =3D=3D -m32 -g -fshort-wchar -fno-strict-aliasing = -Wall -malign-double -idirafter/usr/include -c -include $(DEST_DIR_DEBUG)/A= utoGen.h GCC:*_*_IA32_PP_FLAGS =3D=3D -m32 -E -x assembler-with-cpp -include $(DE= ST_DIR_DEBUG)/AutoGen.h @@ -111,8 +99,8 @@ !endif =20 !if $(UNIT_TEST_FRAMEWORK_MODE) =3D=3D CMOCKA - GCC:*_*_IA32_DLINK_FLAGS =3D=3D -o $(BIN_DIR)/$(BASE_NAME) -m32 -L/usr/X= 11R6/lib -L$(CMOCKA_LIB_PATH) - GCC:*_*_IA32_DLINK2_FLAGS =3D=3D -Wno-error -no-pie -l$(CMOCKA_LIB_NAME) + GCC:*_*_IA32_DLINK_FLAGS =3D=3D -o $(BIN_DIR)/$(BASE_NAME) -m32 -L/usr/X= 11R6/lib + GCC:*_*_IA32_DLINK2_FLAGS =3D=3D -Wno-error -no-pie !endif =20 GCC:*_*_X64_DLINK_FLAGS =3D=3D -o $(BIN_DIR)/$(BASE_NAME) -m64 -L/usr/X1= 1R6/lib @@ -129,8 +117,8 @@ !endif =20 !if $(UNIT_TEST_FRAMEWORK_MODE) =3D=3D CMOCKA - GCC:*_*_X64_DLINK_FLAGS =3D=3D -o $(BIN_DIR)/$(BASE_NAME) -m64 -L/usr/X1= 1R6/lib -L$(CMOCKA_LIB_PATH_64) - GCC:*_*_X64_DLINK2_FLAGS =3D=3D -Wno-error -no-pie -l$(CMOCKA_LIB_NAME_6= 4) + GCC:*_*_X64_DLINK_FLAGS =3D=3D -o $(BIN_DIR)/$(BASE_NAME) -m64 -L/usr/X1= 1R6/lib + GCC:*_*_X64_DLINK2_FLAGS =3D=3D -Wno-error -no-pie !endif =20 GCC:*_GCC5_*_CC_FLAGS =3D -fstack-protector -fstack-protector-strong -fs= tack-protector-all @@ -143,7 +131,3 @@ !if $(UNIT_TEST_FRAMEWORK_MODE) =3D=3D CUNIT GCC:*_*_*_CC_FLAGS =3D -I"$(CUNIT_INC_PATH)" !endif - -!if $(UNIT_TEST_FRAMEWORK_MODE) =3D=3D CMOCKA - GCC:*_*_*_CC_FLAGS =3D -I"$(CMOCKA_INC_PATH)" -!endif diff --git a/HBFA/UefiHostUnitTestPkg/UefiHostUnitTestPkg.dsc b/HBFA/UefiHo= stUnitTestPkg/UefiHostUnitTestPkg.dsc index 59ab6700d2c6..0f56d1ebfb22 100644 --- a/HBFA/UefiHostUnitTestPkg/UefiHostUnitTestPkg.dsc +++ b/HBFA/UefiHostUnitTestPkg/UefiHostUnitTestPkg.dsc @@ -84,6 +84,7 @@ !if $(UNIT_TEST_FRAMEWORK_MODE) =3D=3D CMOCKA UnitTestLib|UefiHostUnitTestPkg/Library/UnitTestLibcmocka/UnitTestLibcmo= cka.inf UnitTestAssertLib|UefiHostUnitTestPkg/Library/UnitTestAssertLibcmocka/Un= itTestAssertLibcmocka.inf + CmockaLib|CmockaHostUnitTestPkg/Library/CmockaLib/CmockaLib.inf !endif =20 [LibraryClasses.common.USER_DEFINED] @@ -96,6 +97,13 @@ !endif =20 !if $(UNIT_TEST_FRAMEWORK_MODE) =3D=3D CMOCKA + CmockaHostUnitTestPkg/Library/CmockaLib/CmockaLib.inf { + + MSFT:*_*_*_CC_FLAGS =3D=3D /c /D _CRT_SECURE_CPP_OVERLOAD_STANDA= RD_NAMES=3D1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=3D1 /D _CRT_N= ONSTDC_NO_WARNINGS=3D1 /D _CRT_SECURE_NO_WARNINGS=3D1 -DHAVE_VSNPRINTF -DHA= VE_SNPRINTF + =20 + GCC:*_*_IA32_CC_FLAGS =3D=3D -m32 -O0 -g -fprofile-arcs -ftest-cove= rage -std=3Dgnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-ali= gn -Werror=3Daddress -Wstrict-prototypes -Werror=3Dstrict-prototypes -Wwrit= e-strings -Werror=3Dwrite-strings -Werror-implicit-function-declaration -Wp= ointer-arith -Werror=3Dpointer-arith -Wdeclaration-after-statement -Werror= =3Ddeclaration-after-statement -Wreturn-type -Werror=3Dreturn-type -Wuninit= ialized -Werror=3Duninitialized -Werror=3Dstrict-overflow -Wstrict-overflow= =3D2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security= -Werror=3Dformat-security -fno-common -Wformat -fno-common -fstack-protect= or-strong -DHAVE_SIGNAL_H + GCC:*_*_X64_CC_FLAGS =3D=3D -m64 -O0 -g -fprofile-arcs -ftest-cove= rage -std=3Dgnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-ali= gn -Werror=3Daddress -Wstrict-prototypes -Werror=3Dstrict-prototypes -Wwrit= e-strings -Werror=3Dwrite-strings -Werror-implicit-function-declaration -Wp= ointer-arith -Werror=3Dpointer-arith -Wdeclaration-after-statement -Werror= =3Ddeclaration-after-statement -Wreturn-type -Werror=3Dreturn-type -Wuninit= ialized -Werror=3Duninitialized -Werror=3Dstrict-overflow -Wstrict-overflow= =3D2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security= -Werror=3Dformat-security -fno-common -Wformat -fno-common -fstack-protect= or-strong -DHAVE_SIGNAL_H + } UefiHostUnitTestPkg/Sample/SampleUnitTestcmocka/SampleUnitTestcmocka.inf !endif =20 --=20 2.21.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 (#41199): https://edk2.groups.io/g/devel/message/41199 Mute This Topic: https://groups.io/mt/31717510/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-