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>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc b/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
index 369a1cb69939949425283285f2c7ea1bc8b0a7a9..3ed3e9b75d84fdfd9178764a23475f0059582f04 100644 (file)
--- a/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
+++ b/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
@@ -20,7 +20,6 @@
 !include UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc\r
 \r
 [LibraryClasses]\r
-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf\r
   MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf\r
   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf\r
@@ -33,8 +32,13 @@
   #\r
   # Build HOST_APPLICATION that tests the SampleUnitTest\r
   #\r
-  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHost.inf\r
-  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf {\r
+  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHost.inf {\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf\r
+  }\r
+  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHost.inf {\r
+    <Defines>\r
+      FILE_GUID = 3604CCB8-138C-488F-8045-18704F73E734\r
     <LibraryClasses>\r
       OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf\r
   }\r

diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf
deleted file mode 100644 (file)
index 9d0fcfd..0000000
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHostAccel.inf
+++ /dev/null
@@ -1,56 +0,0 @@
-## @file\r
-# Host-based UnitTest for BaseCryptLib\r
-#\r
-# Copyright (c) Microsoft Corporation.<BR>\r
-# Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>\r
-# SPDX-License-Identifier: BSD-2-Clause-Patent\r
-##\r
-\r
-[Defines]\r
-  INF_VERSION    = 0x00010005\r
-  BASE_NAME      = BaseCryptLibUnitTestHostAccel\r
-  FILE_GUID      = B1AED64E-B53A-4D69-B0BA-60EEDAC47A6B\r
-  MODULE_TYPE    = HOST_APPLICATION\r
-  VERSION_STRING = 1.0\r
-\r
-#\r
-# The following information is for reference only and not required by the build tools.\r
-#\r
-#  VALID_ARCHITECTURES           = IA32 X64\r
-#\r
-\r
-[Sources]\r
-  UnitTestMain.c\r
-  BaseCryptLibUnitTests.c\r
-  TestBaseCryptLib.h\r
-  HashTests.c\r
-  HmacTests.c\r
-  BlockCipherTests.c\r
-  RsaTests.c\r
-  RsaPkcs7Tests.c\r
-  Pkcs5Pbkdf2Tests.c\r
-  AuthenticodeTests.c\r
-  TSTests.c\r
-  DhTests.c\r
-  RandTests.c\r
-  Pkcs7EkuTests.c\r
-  OaepEncryptTests.c\r
-  RsaPssTests.c\r
-  ParallelhashTests.c\r
-  HkdfTests.c\r
-  AeadAesGcmTests.c\r
-  BnTests.c\r
-  EcTests.c\r
-  X509Tests.c\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  CryptoPkg/CryptoPkg.dec\r
-\r
-[LibraryClasses]\r
-  BaseLib\r
-  DebugLib\r
-  BaseCryptLib\r
-  UnitTestLib\r
-  MmServicesTableLib\r
-  SynchronizationLib\r