[edk2-devel] [Patch 1/1] CryptoPkg/Test: Simplify BaseCryptLib host based unit tests

[Wang, Jian J]

Reviewed-by: Jian J Wang <jian.j.wang at intel.com>

Regards,
Jian

> -----Original Message-----
> From: Kinney, Michael D <michael.d.kinney at intel.com>
> Sent: Saturday, October 29, 2022 3:01 AM
> To: devel at edk2.groups.io
> Cc: Yao, Jiewen <jiewen.yao at intel.com>; Wang, Jian J <jian.j.wang at intel.com>;
> Lu, Xiaoyu1 <xiaoyu1.lu at intel.com>; Jiang, Guomin <guomin.jiang at 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 at intel.com>
> Cc: Jian J Wang <jian.j.wang at intel.com>
> Cc: Xiaoyu Lu <xiaoyu1.lu at intel.com>
> Cc: Guomin Jiang <guomin.jiang at intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney at 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



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#95826): https://edk2.groups.io/g/devel/message/95826
Mute This Topic: https://groups.io/mt/94633928/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-