Merge pull request dotnet#35363 from janvorli/fix-unloadability-tests

Fix failures in unloadability tests
solovis-mherndon · Apr 24, 2020 · a1aca9d · a1aca9d
2 parents e0a27ec + 09c54dc
commit a1aca9d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/src/coreclr/src/vm/class.cpp b/src/coreclr/src/vm/class.cpp
@@ -87,9 +87,6 @@ void EEClass::Destruct(MethodTable * pOwningMT)
 
 #ifndef CROSSGEN_COMPILE
 
-    // Not expected to be called for array EEClass
-    _ASSERTE(!pOwningMT->IsArray());
-
 #ifdef _DEBUG
     _ASSERTE(!IsDestroyed());
     SetDestroyed();

diff --git a/src/coreclr/tests/src/Interop/COM/ComWrappers/API/ComWrappersTests.csproj b/src/coreclr/tests/src/Interop/COM/ComWrappers/API/ComWrappersTests.csproj
@@ -3,6 +3,8 @@
     <OutputType>Exe</OutputType>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <!-- Native COM interfaces left alive at the test exit -->
+    <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
     <DisableProjectBuild Condition="'$(TargetsWindows)' != 'true'">true</DisableProjectBuild>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>

diff --git a/src/coreclr/tests/src/Loader/binding/tracing/BinderTracingTest.Basic.csproj b/src/coreclr/tests/src/Loader/binding/tracing/BinderTracingTest.Basic.csproj
@@ -1,4 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <!-- TestAssemblyLoadContext.Load called from the finalizer -->
+    <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="BinderTracingTest.Basic.cs" />
     <Compile Include="BinderTracingTest.DefaultProbing.cs" />

diff --git a/src/coreclr/tests/src/Loader/binding/tracing/BinderTracingTest.ResolutionFlow.csproj b/src/coreclr/tests/src/Loader/binding/tracing/BinderTracingTest.ResolutionFlow.csproj
@@ -1,4 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <!-- Test creates non-collectible AssemblyLoadContext -->
+    <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="BinderTracingTest.EventHandlers.cs" />
     <Compile Include="BinderTracingTest.ResolutionFlow.cs" />