[edk2-devel] [Patch 1/1] CryptoPkg: Simplify DSC by using UnitTestFrameworkPkgTarget.dsc.inc

[Yao, Jiewen]

Reviewed-by: Jiewen Yao <Jiewen.yao at intel.com>

> -----Original Message-----
> From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Michael D
> Kinney
> Sent: Wednesday, March 31, 2021 8:29 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, XiaoyuX <xiaoyux.lu at intel.com>; Jiang, Guomin <guomin.jiang at intel.com>;
> Bret Barkelew <Bret.Barkelew at microsoft.com>
> Subject: [edk2-devel] [Patch 1/1] CryptoPkg: Simplify DSC by using
> UnitTestFrameworkPkgTarget.dsc.inc
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3288
> 
> Simplify the DSC file by using the library mappings from
> UnitTestFrameworkPkgTarget.dsc.inc to build the CryptoPkg
> target based unit tests that run from the UEFI Shell.
> 
> Cc: Jiewen Yao <jiewen.yao at intel.com>
> Cc: Jian J Wang <jian.j.wang at intel.com>
> Cc: Xiaoyu Lu <xiaoyux.lu at intel.com>
> Cc: Guomin Jiang <guomin.jiang at intel.com>
> Cc: Bret Barkelew <Bret.Barkelew at microsoft.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney at intel.com>
> ---
>  CryptoPkg/CryptoPkg.dsc | 25 ++++---------------------
>  1 file changed, 4 insertions(+), 21 deletions(-)
> 
> diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc
> index 55383f2722a1..09079a2ffef3 100644
> --- a/CryptoPkg/CryptoPkg.dsc
> +++ b/CryptoPkg/CryptoPkg.dsc
> @@ -2,7 +2,7 @@
>  #  Cryptographic Library Package for UEFI Security Implementation.
>  #  PEIM, DXE Driver, and SMM Driver with all crypto services enabled.
>  #
> -#  Copyright (c) 2009 - 2020, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2009 - 2021, Intel Corporation. All rights reserved.<BR>
>  #  Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights
> reserved.<BR>
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -45,6 +45,8 @@ [Defines]
>    !error CRYPTO_SERVICES must be set to one of PACKAGE ALL NONE MIN_PEI
> MIN_DXE_MIN_SMM.
>  !endif
> 
> +!include UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc
> +
> 
> #################################################################
> ###############
>  #
>  # Library Class section - list of all Library Classes needed by this Platform.
> @@ -226,26 +228,7 @@ [PcdsFixedAtBuild]
> 
> #################################################################
> ##################################
>  [Components]
>    CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> -  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibShell.inf {
> -    <LibraryClasses>
> -      PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
> -
> UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoin
> t.inf
> -
> UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiAppli
> cationEntryPoint.inf
> -
> -      BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
> -      BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
> -      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
> -
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryA
> llocationLib.inf
> -      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
> -      PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
> -
> PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLib
> Null.inf
> -      PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
> -
> UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootS
> ervicesTableLib.inf
> -
> -      UnitTestLib|UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.inf
> -
> UnitTestPersistenceLib|UnitTestFrameworkPkg/Library/UnitTestPersistenceLibN
> ull/UnitTestPersistenceLibNull.inf
> -
> UnitTestResultReportLib|UnitTestFrameworkPkg/Library/UnitTestResultReportL
> ib/UnitTestResultReportLibDebugLib.inf
> -  }
> +  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibShell.inf
> 
>  !if $(CRYPTO_SERVICES) == PACKAGE
>  [Components]
> --
> 2.31.1.windows.1
> 
> 
> 
> 
> 



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