From 25222ac722962f9a041e73b35f6e7dcbb2d3b5d8 Mon Sep 17 00:00:00 2001
From: mingkuang <mingkuang@live.com>
Date: Wed, 27 Nov 2024 22:20:36 +0800
Subject: [PATCH] =?UTF-8?q?Opt,=20=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=87=A0=E4=B9=8E=E4=B8=BA0=E7=9A=84ARM?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC(=E5=90=8C=E6=97=B6=E9=81=BF=E5=85=8DCI?=
 =?UTF-8?q?=E7=BC=BA=E5=B0=91ARM=E7=8E=AF=E5=A2=83=E8=80=8C=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA=E5=A4=B1=E8=B4=A5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Build.proj                            |  16 ++--
 UnitTest/UnitTest.cpp                 | 128 +++++++++++++-------------
 UnitTest/detect_mismatch_UnitTest.cpp |  20 ++--
 3 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/Build.proj b/Build.proj
index 0c835f8..7b20168 100644
--- a/Build.proj
+++ b/Build.proj
@@ -113,7 +113,7 @@
 
     <Copy SourceFiles="$(UniversalCRTSdkDir)Redist\$(WindowsTargetPlatformVersion)\ucrt\DLLs\x86\ucrtbase.dll" DestinationFiles="$(SolutionDir)Redist\x86\CRT\ucrtbase.dll" />
     <Copy SourceFiles="$(UniversalCRTSdkDir)Redist\$(WindowsTargetPlatformVersion)\ucrt\DLLs\x64\ucrtbase.dll" DestinationFiles="$(SolutionDir)Redist\x64\CRT\ucrtbase.dll" />
-    <Copy SourceFiles="$(UniversalCRTSdkDir)Redist\$(WindowsTargetPlatformVersion)\ucrt\DLLs\arm\ucrtbase.dll" DestinationFiles="$(SolutionDir)Redist\arm\CRT\ucrtbase.dll" Condition="Exists('$(UniversalCRTSdkDir)Redist\$(WindowsTargetPlatformVersion)\ucrt\DLLs\arm\ucrtbase.dll')"/>
+    <!--<Copy SourceFiles="$(UniversalCRTSdkDir)Redist\$(WindowsTargetPlatformVersion)\ucrt\DLLs\arm\ucrtbase.dll" DestinationFiles="$(SolutionDir)Redist\arm\CRT\ucrtbase.dll" Condition="Exists('$(UniversalCRTSdkDir)Redist\$(WindowsTargetPlatformVersion)\ucrt\DLLs\arm\ucrtbase.dll')"/>-->
     <Copy SourceFiles="$(UniversalCRTSdkDir)Redist\$(WindowsTargetPlatformVersion)\ucrt\DLLs\arm64\ucrtbase.dll" DestinationFiles="$(SolutionDir)Redist\arm64\CRT\ucrtbase.dll" Condition="Exists('$(UniversalCRTSdkDir)Redist\$(WindowsTargetPlatformVersion)\ucrt\DLLs\arm64\ucrtbase.dll')"/>
 
     <ItemGroup>
@@ -128,7 +128,7 @@
 
     <Copy SourceFiles="@(CRTx86)" DestinationFolder="$(SolutionDir)Redist\x86\CRT"/>
     <Copy SourceFiles="@(CRTx64)" DestinationFolder="$(SolutionDir)Redist\x64\CRT"/>
-    <Copy SourceFiles="@(CRTarm)" DestinationFolder="$(SolutionDir)Redist\arm\CRT"/>
+    <!--<Copy SourceFiles="@(CRTarm)" DestinationFolder="$(SolutionDir)Redist\arm\CRT"/>-->
     <Copy SourceFiles="@(CRTarm64)" DestinationFolder="$(SolutionDir)Redist\arm64\CRT"/>
 
     <ItemGroup>
@@ -140,7 +140,7 @@
 
     <Copy SourceFiles="@(CXXAMPx86)" DestinationFolder="$(SolutionDir)Redist\x86\CXXAMP" />
     <Copy SourceFiles="@(CXXAMPx64)" DestinationFolder="$(SolutionDir)Redist\x64\CXXAMP" />
-    <Copy SourceFiles="@(CXXAMParm)" DestinationFolder="$(SolutionDir)Redist\arm\CXXAMP" />
+    <!--<Copy SourceFiles="@(CXXAMParm)" DestinationFolder="$(SolutionDir)Redist\arm\CXXAMP" />-->
     <Copy SourceFiles="@(CXXAMParm64)" DestinationFolder="$(SolutionDir)Redist\arm64\CXXAMP" />
 
 
@@ -153,7 +153,7 @@
 
     <Copy SourceFiles="@(OPENMPx86)" DestinationFolder="$(SolutionDir)Redist\x86\OPENMP" />
     <Copy SourceFiles="@(OPENMPx64)" DestinationFolder="$(SolutionDir)Redist\x64\OPENMP" />
-    <Copy SourceFiles="@(OPENMParm)" DestinationFolder="$(SolutionDir)Redist\arm\OPENMP" />
+    <!--<Copy SourceFiles="@(OPENMParm)" DestinationFolder="$(SolutionDir)Redist\arm\OPENMP" />-->
     <Copy SourceFiles="@(OPENMParm64)" DestinationFolder="$(SolutionDir)Redist\arm64\OPENMP" />
 
 
@@ -166,7 +166,7 @@
 
     <Copy SourceFiles="@(MFCx86)" DestinationFolder="$(SolutionDir)Redist\x86\MFC" />
     <Copy SourceFiles="@(MFCx64)" DestinationFolder="$(SolutionDir)Redist\x64\MFC" />
-    <Copy SourceFiles="@(MFCarm)" DestinationFolder="$(SolutionDir)Redist\arm\MFC" />
+    <!--<Copy SourceFiles="@(MFCarm)" DestinationFolder="$(SolutionDir)Redist\arm\MFC" />-->
     <Copy SourceFiles="@(MFCarm64)" DestinationFolder="$(SolutionDir)Redist\arm64\MFC" />
 
     <ItemGroup>
@@ -178,7 +178,7 @@
 
     <Copy SourceFiles="@(MFCLOCx86)" DestinationFolder="$(SolutionDir)Redist\x86\MFCLOC" />
     <Copy SourceFiles="@(MFCLOCx64)" DestinationFolder="$(SolutionDir)Redist\x64\MFCLOC" />
-    <Copy SourceFiles="@(MFCLOCarm)" DestinationFolder="$(SolutionDir)Redist\arm\MFCLOC" />
+    <!--<Copy SourceFiles="@(MFCLOCarm)" DestinationFolder="$(SolutionDir)Redist\arm\MFCLOC" />-->
     <Copy SourceFiles="@(MFCLOCarm64)" DestinationFolder="$(SolutionDir)Redist\arm64\MFCLOC" />
 
 
@@ -194,9 +194,9 @@
   </Target>
   
   <Target Name="_GetProjectAllConfiguration" Returns="@(AllProjectReferenceConfigurations)">
-    <!--故意过滤Debug配置-->
+    <!--故意过滤Debug配置 与 ARM配置，因为ARM的人实在是太少了。-->
     <CreateItem
-      Condition="'%(ProjectConfiguration.Configuration)' != 'Debug'"
+      Condition="'%(ProjectConfiguration.Configuration)' != 'Debug' and '%(ProjectConfiguration.Platform)' != 'ARM'"
       Include="$(MSBuildProjectFullPath)"
       AdditionalMetadata="Configuration=%(ProjectConfiguration.Configuration);Platform=%(ProjectConfiguration.Platform);WindowsTargetPlatformMinVersion=%(ProjectConfiguration.WindowsTargetPlatformMinVersion);AdditionalProperties=Configuration=%(ProjectConfiguration.Configuration)%3BPlatform=%(ProjectConfiguration.Platform)%3BWindowsTargetPlatformMinVersion=%(ProjectConfiguration.WindowsTargetPlatformMinVersion)">
       <Output TaskParameter="Include" ItemName="AllProjectReferenceConfigurations"/>
diff --git a/UnitTest/UnitTest.cpp b/UnitTest/UnitTest.cpp
index 014688b..79ef107 100644
--- a/UnitTest/UnitTest.cpp
+++ b/UnitTest/UnitTest.cpp
@@ -330,14 +330,14 @@ namespace UnitTest
 				);
 
 			
-			TestLib(
-				VCToolsInstallDir LR"(lib\arm\vcruntime.lib)",
-				L"vcruntime",
-				L"arm",
-				{ L"Dynamic", L"Static" },
-				{ L"6.2.9200.0" },
-				Info
-				);
+			//TestLib(
+			//	VCToolsInstallDir LR"(lib\arm\vcruntime.lib)",
+			//	L"vcruntime",
+			//	L"arm",
+			//	{ L"Dynamic", L"Static" },
+			//	{ L"6.2.9200.0" },
+			//	Info
+			//	);
 		}
 		
 		TEST_METHOD(vcruntime_msvcrt_Debug模式所有符号可以被链接)
@@ -368,14 +368,14 @@ namespace UnitTest
 				);
 
 			
-			TestLib(
-				VCToolsInstallDir LR"(lib\arm\vcruntimed.lib)",
-				L"vcruntime",
-				L"arm",
-				{ L"DDynamic", L"DStatic" },
-				{ L"6.2.9200.0" },
-				Info
-				);
+			//TestLib(
+			//	VCToolsInstallDir LR"(lib\arm\vcruntimed.lib)",
+			//	L"vcruntime",
+			//	L"arm",
+			//	{ L"DDynamic", L"DStatic" },
+			//	{ L"6.2.9200.0" },
+			//	Info
+			//	);
 		}
 
 		TEST_METHOD(vcruntime_ucrt模式所有符号可以被链接)
@@ -403,14 +403,14 @@ namespace UnitTest
 				Info
 				);
 
-			TestLib(
-				VCToolsInstallDir LR"(lib\arm\vcruntime.lib)",
-				L"vcruntime",
-				L"arm",
-				{ L"Dynamic", L"Static" },
-				{ L"10.0.10240.0", L"10.0.19041.0" },
-				Info
-				);
+			//TestLib(
+			//	VCToolsInstallDir LR"(lib\arm\vcruntime.lib)",
+			//	L"vcruntime",
+			//	L"arm",
+			//	{ L"Dynamic", L"Static" },
+			//	{ L"10.0.10240.0", L"10.0.19041.0" },
+			//	Info
+			//	);
 
 			TestLib(
 				VCToolsInstallDir LR"(lib\arm64\vcruntime.lib)",
@@ -448,14 +448,14 @@ namespace UnitTest
 				Info
 				);
 			
-			TestLib(
-				VCToolsInstallDir LR"(lib\arm\vcruntimed.lib)",
-				L"vcruntime",
-				L"arm",
-				{ L"DDynamic", L"DStatic" },
-				{ L"10.0.10240.0", L"10.0.19041.0" },
-				Info
-				);
+			//TestLib(
+			//	VCToolsInstallDir LR"(lib\arm\vcruntimed.lib)",
+			//	L"vcruntime",
+			//	L"arm",
+			//	{ L"DDynamic", L"DStatic" },
+			//	{ L"10.0.10240.0", L"10.0.19041.0" },
+			//	Info
+			//	);
 
 			TestLib(
 				VCToolsInstallDir LR"(lib\arm64\vcruntimed.lib)",
@@ -495,14 +495,14 @@ namespace UnitTest
 				);
 
 
-			TestLib(
-				CurrentUniversalCRTSdkDir LR"(ucrt\arm\ucrt.lib)",
-				L"ucrt",
-				L"arm",
-				{ L"Dynamic", L"Static" },
-				{ L"6.2.9200.0" },
-				Info
-				);
+			//TestLib(
+			//	CurrentUniversalCRTSdkDir LR"(ucrt\arm\ucrt.lib)",
+			//	L"ucrt",
+			//	L"arm",
+			//	{ L"Dynamic", L"Static" },
+			//	{ L"6.2.9200.0" },
+			//	Info
+			//	);
 		}
 		
 		TEST_METHOD(ucrt_msvcrt_Debug模式所有符号可以被链接)
@@ -532,14 +532,14 @@ namespace UnitTest
 				);
 
 
-			TestLib(
-				CurrentUniversalCRTSdkDir LR"(ucrt\arm\ucrtd.lib)",
-				L"ucrt",
-				L"arm",
-				{ L"DDynamic", L"DStatic" },
-				{ L"6.2.9200.0" },
-				Info
-				);
+			//TestLib(
+			//	CurrentUniversalCRTSdkDir LR"(ucrt\arm\ucrtd.lib)",
+			//	L"ucrt",
+			//	L"arm",
+			//	{ L"DDynamic", L"DStatic" },
+			//	{ L"6.2.9200.0" },
+			//	Info
+			//	);
 		}
 
 		TEST_METHOD(ucrt_ucrt模式所有符号可以被链接)
@@ -567,14 +567,14 @@ namespace UnitTest
 				Info
 				);
 
-			TestLib(
-				CurrentUniversalCRTSdkDir LR"(ucrt\arm\ucrt.lib)",
-				L"ucrt",
-				L"arm",
-				{ L"Dynamic", L"Static" },
-				{ L"10.0.10240.0", L"10.0.19041.0" },
-				Info
-				);
+			//TestLib(
+			//	CurrentUniversalCRTSdkDir LR"(ucrt\arm\ucrt.lib)",
+			//	L"ucrt",
+			//	L"arm",
+			//	{ L"Dynamic", L"Static" },
+			//	{ L"10.0.10240.0", L"10.0.19041.0" },
+			//	Info
+			//	);
 
 			TestLib(
 				CurrentUniversalCRTSdkDir LR"(ucrt\arm64\ucrt.lib)",
@@ -613,14 +613,14 @@ namespace UnitTest
 				Info
 				);
 
-			TestLib(
-				CurrentUniversalCRTSdkDir LR"(ucrt\arm\ucrtd.lib)",
-				L"ucrt",
-				L"arm",
-				{ L"DDynamic", L"DStatic" },
-				{ L"10.0.10240.0", L"10.0.19041.0" },
-				Info
-				);
+			//TestLib(
+			//	CurrentUniversalCRTSdkDir LR"(ucrt\arm\ucrtd.lib)",
+			//	L"ucrt",
+			//	L"arm",
+			//	{ L"DDynamic", L"DStatic" },
+			//	{ L"10.0.10240.0", L"10.0.19041.0" },
+			//	Info
+			//	);
 			
 			TestLib(
 				CurrentUniversalCRTSdkDir LR"(ucrt\arm64\ucrtd.lib)",
diff --git a/UnitTest/detect_mismatch_UnitTest.cpp b/UnitTest/detect_mismatch_UnitTest.cpp
index 52c1f2c..9a8651c 100644
--- a/UnitTest/detect_mismatch_UnitTest.cpp
+++ b/UnitTest/detect_mismatch_UnitTest.cpp
@@ -63,15 +63,15 @@ namespace UnitTest
 				BuildProperty
 			);
 
-			RunTest(
-				pTestCode,
-				cbTestCode,
-				DetectName,
-				L"arm",
-				{ L"Dynamic", L"Static", L"DDynamic", L"DStatic" },
-				{ L"6.2.9200.0", L"10.0.10240.0", L"10.0.19041.0" },
-				BuildProperty
-			);
+			//RunTest(
+			//	pTestCode,
+			//	cbTestCode,
+			//	DetectName,
+			//	L"arm",
+			//	{ L"Dynamic", L"Static", L"DDynamic", L"DStatic" },
+			//	{ L"6.2.9200.0", L"10.0.10240.0", L"10.0.19041.0" },
+			//	BuildProperty
+			//);
 
 			RunTest(
 				pTestCode,
@@ -103,4 +103,4 @@ namespace UnitTest
 			}
 		}
 	};
-}
\ No newline at end of file
+}