From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web11.611.1666983649997537996 for ; Fri, 28 Oct 2022 12:00:50 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=AFfaGYpx; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: michael.d.kinney@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666983650; x=1698519650; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=EuRgdXMAdtjuKNQG9nsQP5R6ZqrSHU7UAJ72giOso+E=; b=AFfaGYpx1/mzJWdHNkL7kkLGB4kfMtleOngVP9VQ9V9kNnksxUFO/cii e6LuOFe1dgnFVdn4rNMqThf+wF2IBYRl06yZWq2Jlb4emARiTpCmyIqgl Mp2cYiBZXHgdsVPO8Jy4rRbnY2JuX6x6KV2omZ/H7IlRBIB7fZNsCmfcT Va1BzKOtP72A428NHyvX4tU1svwabGbEF19xvSPJgNRovTu5tnUgUppUe F4tkyl8de74U/dOnNEEIkVTwrkKwNcYM/yJeQpswnM0db4DziWpILaoJd qzstg3gNVaSJ1GAQ9yQuB9fGXl/ZbHW1KbtIqnkt9N68Pu6N4NploL4sG Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10514"; a="288283555" X-IronPort-AV: E=Sophos;i="5.95,222,1661842800"; d="scan'208";a="288283555" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Oct 2022 12:00:40 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10514"; a="610845545" X-IronPort-AV: E=Sophos;i="5.95,222,1661842800"; d="scan'208";a="610845545" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.104.243]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Oct 2022 12:00:40 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang , Xiaoyu Lu , Guomin Jiang Subject: [Patch 1/1] CryptoPkg/Test: Simplify BaseCryptLib host based unit tests Date: Fri, 28 Oct 2022 12:00:34 -0700 Message-Id: <20221028190034.1642-1-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.37.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Cc: Jian J Wang Cc: Xiaoyu Lu Cc: Guomin Jiang Signed-off-by: Michael D Kinney --- 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 { + + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf + } + CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHost.inf { + + FILE_GUID = 3604CCB8-138C-488F-8045-18704F73E734 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.
-# Copyright (c) 2022, Intel Corporation. All rights reserved.
-# 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