From 46c6de57b0628567ed3e72a7c65d1e6c708312cc Mon Sep 17 00:00:00 2001 From: Michael D Kinney Date: Fri, 2 Feb 2024 17:04:33 -0800 Subject: [PATCH] UnitTestFrameworkPkg: MSFT CC_FLAGS add /MT to for host builds REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4683 Add /MT to MSFT CC_FLAGS to always use release libraries when building host-based unit tests so any exceptions generated during host-based test execution generate an error message in stderr instead of a popup window. Use /MTd when -D UNIT_TESTING_DEBUG is to use debug libraries when building host-based unit tests so any exceptions generated during host-based test execution generate a popup window with option to attach a debugger. Cc: Michael Kubacki Cc: Sean Brogan Signed-off-by: Michael D Kinney Reviewed-by: Michael Kubacki --- UnitTestFrameworkPkg/Library/GoogleTestLib/GoogleTestLib.inf | 2 +- UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/UnitTestFrameworkPkg/Library/GoogleTestLib/GoogleTestLib.inf b/UnitTestFrameworkPkg/Library/GoogleTestLib/GoogleTestLib.inf index 0104384953..83ab9f9b2a 100644 --- a/UnitTestFrameworkPkg/Library/GoogleTestLib/GoogleTestLib.inf +++ b/UnitTestFrameworkPkg/Library/GoogleTestLib/GoogleTestLib.inf @@ -28,6 +28,6 @@ UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec [BuildOptions] - MSFT:*_*_*_CC_FLAGS == /c /EHsc /Zi /Od + MSFT:*_*_*_CC_FLAGS == /c /EHsc /Zi /Od /MT GCC:*_*_IA32_CC_FLAGS == -g -c -fshort-wchar -O0 -m32 GCC:*_*_X64_CC_FLAGS == -g -c -fshort-wchar -O0 -m64 diff --git a/UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc b/UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc index b8068fd91c..00f8d9a895 100644 --- a/UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc +++ b/UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc @@ -24,9 +24,10 @@ PeiServicesTablePointerLib|UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLib.inf [BuildOptions] + MSFT:*_*_*_CC_FLAGS = /MT GCC:*_*_*_CC_FLAGS = -fno-pie !ifdef $(UNIT_TESTING_DEBUG) - MSFT:*_*_*_CC_FLAGS = -D UNIT_TESTING_DEBUG=1 + MSFT:*_*_*_CC_FLAGS = /MTd -D UNIT_TESTING_DEBUG=1 GCC:*_*_*_CC_FLAGS = -D UNIT_TESTING_DEBUG=1 XCODE:*_*_*_CC_FLAGS = -D UNIT_TESTING_DEBUG=1 !endif