From 3de44af58deb1358b417cc404fa31929572b079b Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Fri, 2 Aug 2024 17:02:44 -0400 Subject: [PATCH] Update host unit test libs The host unit test need changes to the library instances linked to compile and pass. Signed-off-by: Michael Kubacki --- .../QemuQ35Pkg/Test/QemuQ35PkgHostTest.dsc | 30 +++++++++++++++---- .../QemuSbsaPkg/Test/QemuSbsaPkgHostTest.dsc | 30 +++++++++++++++---- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/Platforms/QemuQ35Pkg/Test/QemuQ35PkgHostTest.dsc b/Platforms/QemuQ35Pkg/Test/QemuQ35PkgHostTest.dsc index 12aa65724..e968d75d1 100644 --- a/Platforms/QemuQ35Pkg/Test/QemuQ35PkgHostTest.dsc +++ b/Platforms/QemuQ35Pkg/Test/QemuQ35PkgHostTest.dsc @@ -39,7 +39,7 @@ VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf - UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf + UefiRuntimeServicesTableLib|MdePkg/Test/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf @@ -83,14 +83,24 @@ MfciRetrievePolicyLib|MfciPkg/Library/MfciRetrievePolicyLibNull/MfciRetrievePolicyLibNull.inf [Components] -MfciPkg/MfciDxe/Test/MfciTargetingHostTest.inf +MfciPkg/MfciDxe/Test/MfciTargetingHostTest.inf { + + UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf +} MfciPkg/MfciDxe/Test/MfciVerifyPolicyAndChangeHostTest.inf { ResetUtilityLib|MfciPkg/UnitTests/Library/MockResetUtilityLib/MockResetUtilityLib.inf BaseCryptLib|MfciPkg/UnitTests/Library/MockBaseCryptLib/MockBaseCryptLib.inf + UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf +} +MfciPkg/MfciDxe/Test/MfciPublicInterfaceHostTest.inf { + + UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf +} +MfciPkg/MfciDxe/Test/MfciMultipleCertsHostTest.inf { + + UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf } -MfciPkg/MfciDxe/Test/MfciPublicInterfaceHostTest.inf -MfciPkg/MfciDxe/Test/MfciMultipleCertsHostTest.inf MsWheaPkg/MsWheaReport/Test/MsWheaReportCommonHostTest.inf { gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x07 @@ -219,10 +229,18 @@ SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimPeiLib/GoogleTest/ConfigKno PeiServicesLib|MdePkg/Test/Mock/Library/GoogleTest/MockPeiServicesLib/MockPeiServicesLib.inf } -NetworkPkg/Dhcp6Dxe/GoogleTest/Dhcp6DxeGoogleTest.inf -NetworkPkg/Ip6Dxe/GoogleTest/Ip6DxeGoogleTest.inf +NetworkPkg/Dhcp6Dxe/GoogleTest/Dhcp6DxeGoogleTest.inf { + + UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf +} +NetworkPkg/Ip6Dxe/GoogleTest/Ip6DxeGoogleTest.inf { + + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf +} NetworkPkg/UefiPxeBcDxe/GoogleTest/UefiPxeBcDxeGoogleTest.inf { + UefiBootServicesTableLib|MdePkg/Test/Mock/Library/GoogleTest/MockUefiBootServicesTableLib/MockUefiBootServicesTableLib.inf UefiRuntimeServicesTableLib|MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf } diff --git a/Platforms/QemuSbsaPkg/Test/QemuSbsaPkgHostTest.dsc b/Platforms/QemuSbsaPkg/Test/QemuSbsaPkgHostTest.dsc index d18ab67c6..ae20dbed3 100644 --- a/Platforms/QemuSbsaPkg/Test/QemuSbsaPkgHostTest.dsc +++ b/Platforms/QemuSbsaPkg/Test/QemuSbsaPkgHostTest.dsc @@ -39,7 +39,7 @@ VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf - UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf + UefiRuntimeServicesTableLib|MdePkg/Test/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf @@ -86,14 +86,24 @@ RngLib|MdePkg/Library/BaseRngLibNull/BaseRngLibNull.inf [Components] -MfciPkg/MfciDxe/Test/MfciTargetingHostTest.inf +MfciPkg/MfciDxe/Test/MfciTargetingHostTest.inf { + + UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf +} MfciPkg/MfciDxe/Test/MfciVerifyPolicyAndChangeHostTest.inf { ResetUtilityLib|MfciPkg/UnitTests/Library/MockResetUtilityLib/MockResetUtilityLib.inf BaseCryptLib|MfciPkg/UnitTests/Library/MockBaseCryptLib/MockBaseCryptLib.inf + UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf +} +MfciPkg/MfciDxe/Test/MfciPublicInterfaceHostTest.inf { + + UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf +} +MfciPkg/MfciDxe/Test/MfciMultipleCertsHostTest.inf { + + UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf } -MfciPkg/MfciDxe/Test/MfciPublicInterfaceHostTest.inf -MfciPkg/MfciDxe/Test/MfciMultipleCertsHostTest.inf MsWheaPkg/MsWheaReport/Test/MsWheaReportCommonHostTest.inf { gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x07 @@ -230,10 +240,18 @@ SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimPeiLib/GoogleTest/ConfigKno PeiServicesLib|MdePkg/Test/Mock/Library/GoogleTest/MockPeiServicesLib/MockPeiServicesLib.inf } -NetworkPkg/Dhcp6Dxe/GoogleTest/Dhcp6DxeGoogleTest.inf -NetworkPkg/Ip6Dxe/GoogleTest/Ip6DxeGoogleTest.inf +NetworkPkg/Dhcp6Dxe/GoogleTest/Dhcp6DxeGoogleTest.inf { + + UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf +} +NetworkPkg/Ip6Dxe/GoogleTest/Ip6DxeGoogleTest.inf { + + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf +} NetworkPkg/UefiPxeBcDxe/GoogleTest/UefiPxeBcDxeGoogleTest.inf { + UefiBootServicesTableLib|MdePkg/Test/Mock/Library/GoogleTest/MockUefiBootServicesTableLib/MockUefiBootServicesTableLib.inf UefiRuntimeServicesTableLib|MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf }