Revert "Base.h: Ignore VA macro Mu change when host tests are enabled"

This reverts commit 7281ec2.
Javagedes · Aug 5, 2024 · bc95b07 · bc95b07
1 parent 90adf2b
commit bc95b07
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
@@ -667,9 +667,7 @@ typedef __builtin_va_list VA_LIST;
 // VA macros for Visual Studio
 // This comes from the VS header:
 //   Microsoft Visual Studio\2017\Enterprise\VC\Tools\MSVC\<version>\include\vadefs.h
-// Do not use when building host-based unit tests as these definitions conflict with those
-// used in original header file.
-#elif defined (_MSC_VER) && !defined (HOST_UNIT_TEST_BUILD)
+#elif defined (_MSC_VER)
 
 //
 // Microsoft compilers

diff --git a/UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc b/UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc
@@ -25,11 +25,6 @@
   NULL|UnitTestFrameworkPkg/Library/UnitTestDebugAssertLib/UnitTestDebugAssertLibHost.inf
 
 [BuildOptions]
-# MU_CHANGE [BEGIN] - Add build flag to detect when building host-based unit tests
-  MSFT:*_*_*_CC_FLAGS  = /MT -D HOST_UNIT_TEST_BUILD=1 /GS- # Disable Stack Protection for Host-Based Unit Tests
-  GCC:*_*_*_CC_FLAGS   = -D HOST_UNIT_TEST_BUILD=1 -fno-stack-protector # Disable Stack Protection for Host-Based Unit Tests
-  XCODE:*_*_*_CC_FLAGS = -D HOST_UNIT_TEST_BUILD=1
-# MU_CHANGE [END] - Add build flag to detect when building host-based unit tests
   GCC:*_*_*_CC_FLAGS = -fno-pie
 !ifdef $(UNIT_TESTING_DEBUG)
   MSFT:*_*_*_CC_FLAGS  = /MTd -D UNIT_TESTING_DEBUG=1