* [Patch 1/1] CryptoPkg/Test: Simplify BaseCryptLib host based unit tests
@ 2022-10-28 19:00 Michael D Kinney
2022-11-01 14:37 ` Yao, Jiewen
2022-11-01 16:27 ` Wang, Jian J
0 siblings, 2 replies; 3+ messages in thread
From: Michael D Kinney @ 2022-10-28 19:00 UTC (permalink / raw)
To: devel; +Cc: Jiewen Yao, Jian J Wang, Xiaoyu Lu, Guomin Jiang
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4130
Remove TestBaseCryptLibHostAccel.inf and instead use FILE_GUID
override in DSC file to run the same unit test INF against
OpensslLibFull.inf and OpensslLibFullAccel.inf
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
CryptoPkg/Test/CryptoPkgHostUnitTest.dsc | 10 +++-
.../TestBaseCryptLibHostAccel.inf | 56 -------------------
2 files changed, 7 insertions(+), 59 deletions(-)
delete mode 100644 CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf
diff --git a/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc b/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
index 369a1cb69939..3ed3e9b75d84 100644
--- a/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
+++ b/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
@@ -20,7 +20,6 @@ [Defines]
!include UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc
[LibraryClasses]
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf
SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
@@ -33,8 +32,13 @@ [Components]
#
# Build HOST_APPLICATION that tests the SampleUnitTest
#
- CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHost.inf
- CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf {
+ CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHost.inf {
+ <LibraryClasses>
+ OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
+ }
+ CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHost.inf {
+ <Defines>
+ FILE_GUID = 3604CCB8-138C-488F-8045-18704F73E734
<LibraryClasses>
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
}
diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf
deleted file mode 100644
index 9d0fcfd3577c..000000000000
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf
+++ /dev/null
@@ -1,56 +0,0 @@
-## @file
-# Host-based UnitTest for BaseCryptLib
-#
-# Copyright (c) Microsoft Corporation.<BR>
-# Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-##
-
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = BaseCryptLibUnitTestHostAccel
- FILE_GUID = B1AED64E-B53A-4D69-B0BA-60EEDAC47A6B
- MODULE_TYPE = HOST_APPLICATION
- VERSION_STRING = 1.0
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-# VALID_ARCHITECTURES = IA32 X64
-#
-
-[Sources]
- UnitTestMain.c
- BaseCryptLibUnitTests.c
- TestBaseCryptLib.h
- HashTests.c
- HmacTests.c
- BlockCipherTests.c
- RsaTests.c
- RsaPkcs7Tests.c
- Pkcs5Pbkdf2Tests.c
- AuthenticodeTests.c
- TSTests.c
- DhTests.c
- RandTests.c
- Pkcs7EkuTests.c
- OaepEncryptTests.c
- RsaPssTests.c
- ParallelhashTests.c
- HkdfTests.c
- AeadAesGcmTests.c
- BnTests.c
- EcTests.c
- X509Tests.c
-
-[Packages]
- MdePkg/MdePkg.dec
- CryptoPkg/CryptoPkg.dec
-
-[LibraryClasses]
- BaseLib
- DebugLib
- BaseCryptLib
- UnitTestLib
- MmServicesTableLib
- SynchronizationLib
--
2.37.1.windows.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Patch 1/1] CryptoPkg/Test: Simplify BaseCryptLib host based unit tests
2022-10-28 19:00 [Patch 1/1] CryptoPkg/Test: Simplify BaseCryptLib host based unit tests Michael D Kinney
@ 2022-11-01 14:37 ` Yao, Jiewen
2022-11-01 16:27 ` Wang, Jian J
1 sibling, 0 replies; 3+ messages in thread
From: Yao, Jiewen @ 2022-11-01 14:37 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io
Cc: Wang, Jian J, Lu, Xiaoyu1, Jiang, Guomin
Reviewed-by: Jiewen Yao <Jiewen.yao@Intel.com>
> -----Original Message-----
> From: Kinney, Michael D <michael.d.kinney@intel.com>
> Sent: Saturday, October 29, 2022 3:01 AM
> To: devel@edk2.groups.io
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Wang, Jian J
> <jian.j.wang@intel.com>; Lu, Xiaoyu1 <xiaoyu1.lu@intel.com>; Jiang,
> Guomin <guomin.jiang@intel.com>
> Subject: [Patch 1/1] CryptoPkg/Test: Simplify BaseCryptLib host based unit
> tests
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4130
>
> Remove TestBaseCryptLibHostAccel.inf and instead use FILE_GUID
> override in DSC file to run the same unit test INF against
> OpensslLibFull.inf and OpensslLibFullAccel.inf
>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
> Cc: Guomin Jiang <guomin.jiang@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> CryptoPkg/Test/CryptoPkgHostUnitTest.dsc | 10 +++-
> .../TestBaseCryptLibHostAccel.inf | 56 -------------------
> 2 files changed, 7 insertions(+), 59 deletions(-)
> delete mode 100644
> CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.i
> nf
>
> diff --git a/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
> b/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
> index 369a1cb69939..3ed3e9b75d84 100644
> --- a/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
> +++ b/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
> @@ -20,7 +20,6 @@ [Defines]
> !include UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc
>
> [LibraryClasses]
> - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
>
> BaseCryptLib|CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.in
> f
>
> MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTab
> leLib.inf
>
> SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchron
> izationLib.inf
> @@ -33,8 +32,13 @@ [Components]
> #
> # Build HOST_APPLICATION that tests the SampleUnitTest
> #
> - CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHost.inf
> -
> CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.i
> nf {
> + CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHost.inf
> {
> + <LibraryClasses>
> + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
> + }
> + CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHost.inf
> {
> + <Defines>
> + FILE_GUID = 3604CCB8-138C-488F-8045-18704F73E734
> <LibraryClasses>
> OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
> }
> diff --git
> a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAcc
> el.inf
> b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAcc
> el.inf
> deleted file mode 100644
> index 9d0fcfd3577c..000000000000
> ---
> a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAcc
> el.inf
> +++ /dev/null
> @@ -1,56 +0,0 @@
> -## @file
> -# Host-based UnitTest for BaseCryptLib
> -#
> -# Copyright (c) Microsoft Corporation.<BR>
> -# Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -##
> -
> -[Defines]
> - INF_VERSION = 0x00010005
> - BASE_NAME = BaseCryptLibUnitTestHostAccel
> - FILE_GUID = B1AED64E-B53A-4D69-B0BA-60EEDAC47A6B
> - MODULE_TYPE = HOST_APPLICATION
> - VERSION_STRING = 1.0
> -
> -#
> -# The following information is for reference only and not required by the
> build tools.
> -#
> -# VALID_ARCHITECTURES = IA32 X64
> -#
> -
> -[Sources]
> - UnitTestMain.c
> - BaseCryptLibUnitTests.c
> - TestBaseCryptLib.h
> - HashTests.c
> - HmacTests.c
> - BlockCipherTests.c
> - RsaTests.c
> - RsaPkcs7Tests.c
> - Pkcs5Pbkdf2Tests.c
> - AuthenticodeTests.c
> - TSTests.c
> - DhTests.c
> - RandTests.c
> - Pkcs7EkuTests.c
> - OaepEncryptTests.c
> - RsaPssTests.c
> - ParallelhashTests.c
> - HkdfTests.c
> - AeadAesGcmTests.c
> - BnTests.c
> - EcTests.c
> - X509Tests.c
> -
> -[Packages]
> - MdePkg/MdePkg.dec
> - CryptoPkg/CryptoPkg.dec
> -
> -[LibraryClasses]
> - BaseLib
> - DebugLib
> - BaseCryptLib
> - UnitTestLib
> - MmServicesTableLib
> - SynchronizationLib
> --
> 2.37.1.windows.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Patch 1/1] CryptoPkg/Test: Simplify BaseCryptLib host based unit tests
2022-10-28 19:00 [Patch 1/1] CryptoPkg/Test: Simplify BaseCryptLib host based unit tests Michael D Kinney
2022-11-01 14:37 ` Yao, Jiewen
@ 2022-11-01 16:27 ` Wang, Jian J
1 sibling, 0 replies; 3+ messages in thread
From: Wang, Jian J @ 2022-11-01 16:27 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io
Cc: Yao, Jiewen, Lu, Xiaoyu1, Jiang, Guomin
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Regards,
Jian
> -----Original Message-----
> From: Kinney, Michael D <michael.d.kinney@intel.com>
> Sent: Saturday, October 29, 2022 3:01 AM
> To: devel@edk2.groups.io
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Wang, Jian J <jian.j.wang@intel.com>;
> Lu, Xiaoyu1 <xiaoyu1.lu@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>
> Subject: [Patch 1/1] CryptoPkg/Test: Simplify BaseCryptLib host based unit tests
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4130
>
> Remove TestBaseCryptLibHostAccel.inf and instead use FILE_GUID
> override in DSC file to run the same unit test INF against
> OpensslLibFull.inf and OpensslLibFullAccel.inf
>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
> Cc: Guomin Jiang <guomin.jiang@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> CryptoPkg/Test/CryptoPkgHostUnitTest.dsc | 10 +++-
> .../TestBaseCryptLibHostAccel.inf | 56 -------------------
> 2 files changed, 7 insertions(+), 59 deletions(-)
> delete mode 100644
> CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf
>
> diff --git a/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
> b/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
> index 369a1cb69939..3ed3e9b75d84 100644
> --- a/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
> +++ b/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
> @@ -20,7 +20,6 @@ [Defines]
> !include UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc
>
> [LibraryClasses]
> - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
> BaseCryptLib|CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
>
> MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib
> .inf
>
> SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizati
> onLib.inf
> @@ -33,8 +32,13 @@ [Components]
> #
> # Build HOST_APPLICATION that tests the SampleUnitTest
> #
> - CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHost.inf
> - CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf
> {
> + CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHost.inf {
> + <LibraryClasses>
> + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
> + }
> + CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHost.inf {
> + <Defines>
> + FILE_GUID = 3604CCB8-138C-488F-8045-18704F73E734
> <LibraryClasses>
> OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
> }
> diff --git
> a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf
> b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf
> deleted file mode 100644
> index 9d0fcfd3577c..000000000000
> ---
> a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf
> +++ /dev/null
> @@ -1,56 +0,0 @@
> -## @file
> -# Host-based UnitTest for BaseCryptLib
> -#
> -# Copyright (c) Microsoft Corporation.<BR>
> -# Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -##
> -
> -[Defines]
> - INF_VERSION = 0x00010005
> - BASE_NAME = BaseCryptLibUnitTestHostAccel
> - FILE_GUID = B1AED64E-B53A-4D69-B0BA-60EEDAC47A6B
> - MODULE_TYPE = HOST_APPLICATION
> - VERSION_STRING = 1.0
> -
> -#
> -# The following information is for reference only and not required by the build
> tools.
> -#
> -# VALID_ARCHITECTURES = IA32 X64
> -#
> -
> -[Sources]
> - UnitTestMain.c
> - BaseCryptLibUnitTests.c
> - TestBaseCryptLib.h
> - HashTests.c
> - HmacTests.c
> - BlockCipherTests.c
> - RsaTests.c
> - RsaPkcs7Tests.c
> - Pkcs5Pbkdf2Tests.c
> - AuthenticodeTests.c
> - TSTests.c
> - DhTests.c
> - RandTests.c
> - Pkcs7EkuTests.c
> - OaepEncryptTests.c
> - RsaPssTests.c
> - ParallelhashTests.c
> - HkdfTests.c
> - AeadAesGcmTests.c
> - BnTests.c
> - EcTests.c
> - X509Tests.c
> -
> -[Packages]
> - MdePkg/MdePkg.dec
> - CryptoPkg/CryptoPkg.dec
> -
> -[LibraryClasses]
> - BaseLib
> - DebugLib
> - BaseCryptLib
> - UnitTestLib
> - MmServicesTableLib
> - SynchronizationLib
> --
> 2.37.1.windows.1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-01 16:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-28 19:00 [Patch 1/1] CryptoPkg/Test: Simplify BaseCryptLib host based unit tests Michael D Kinney
2022-11-01 14:37 ` Yao, Jiewen
2022-11-01 16:27 ` Wang, Jian J
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox