Disable manual COM registration logic on ARM32 (dotnet/coreclr#19042)

* Add advapi32.lib to the list of libs to link against on ARM.
Remove conditional build on ARM in source.

* Manually edit ARM and ARM64 test lists.

Commit migrated from https://github.com/dotnet/coreclr/commit/af0b442c17fe3a9a95370e506a36ce72ee99ea80

diff --git a/src/coreclr/tests/arm/Tests.lst b/src/coreclr/tests/arm/Tests.lst
index 24a6a39..efb736c 100644 (file)
--- a/src/coreclr/tests/arm/Tests.lst
+++ b/src/coreclr/tests/arm/Tests.lst
@@ -94364,14 +94364,6 @@ MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS;NEW;EXCLUDED
 HostStyle=0
 
-[ClassicCOMUnitTest.cmd_11855]
-RelativePath=Interop\ClassicCOM\ClassicCOMUnitTest\ClassicCOMUnitTest.cmd
-WorkingDir=Interop\ClassicCOM\ClassicCOMUnitTest
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=EXPECTED_PASS;NEW
-HostStyle=0
-
 [Matrix4x4_ro.cmd_11856]
 RelativePath=JIT\SIMD\Matrix4x4_ro\Matrix4x4_ro.cmd
 WorkingDir=JIT\SIMD\Matrix4x4_ro

diff --git a/src/coreclr/tests/arm64/Tests.lst b/src/coreclr/tests/arm64/Tests.lst
index 126b545..d359d9d 100644 (file)
--- a/src/coreclr/tests/arm64/Tests.lst
+++ b/src/coreclr/tests/arm64/Tests.lst
@@ -94332,14 +94332,6 @@ MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS;NEW;EXCLUDED
 HostStyle=0
 
-[ClassicCOMUnitTest.cmd_12169]
-RelativePath=Interop\ClassicCOM\ClassicCOMUnitTest\ClassicCOMUnitTest.cmd
-WorkingDir=Interop\ClassicCOM\ClassicCOMUnitTest
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=EXPECTED_PASS;NEW
-HostStyle=0
-
 [Matrix4x4_ro.cmd_12170]
 RelativePath=JIT\SIMD\Matrix4x4_ro\Matrix4x4_ro.cmd
 WorkingDir=JIT\SIMD\Matrix4x4_ro

diff --git a/src/coreclr/tests/src/Interop/CMakeLists.txt b/src/coreclr/tests/src/Interop/CMakeLists.txt
index 04ec8aa..ff103ea 100644 (file)
--- a/src/coreclr/tests/src/Interop/CMakeLists.txt
+++ b/src/coreclr/tests/src/Interop/CMakeLists.txt
@@ -3,6 +3,7 @@ if(WIN32)
     if(CLR_CMAKE_HOST_ARCH STREQUAL arm)
         list(APPEND LINK_LIBRARIES_ADDITIONAL
             ole32.lib
+            advapi32.lib
         )
     endif(CLR_CMAKE_HOST_ARCH STREQUAL arm)
 endif(WIN32)