summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSteve MacLean <stmaclea@microsoft.com>2019-04-21 18:25:04 -0400
committerGitHub <noreply@github.com>2019-04-21 18:25:04 -0400
commita36bc61442d89d0b5c58b0b14e7bd3bde218f24d (patch)
tree2b81845ab584a090b66f8d5490e7d91a506f118d /tests
parentc48969221da787abaa0c6f1477ec9c864f0455d2 (diff)
downloadcoreclr-a36bc61442d89d0b5c58b0b14e7bd3bde218f24d.tar.gz
coreclr-a36bc61442d89d0b5c58b0b14e7bd3bde218f24d.tar.bz2
coreclr-a36bc61442d89d0b5c58b0b14e7bd3bde218f24d.zip
Fix AssemblyName cache hash and key (#24138)
* Add ContextualReflection LoadWithPartialName case * Remove unnecessary MethodImplOptions.NoInlining * Remove m_assembly warning * Fix AssemblyName hash function * AssemblyNative::Load fix stackMark usage Do not use the stackMark if (ptrLoadContextBinder != NULL) * Temporarily disable DefaultContextOverrideTPA Test is failing due to a logic error. Fix is pending in https://github.com/dotnet/corefx/pull/37071
Diffstat (limited to 'tests')
-rw-r--r--tests/CoreFX/CoreFX.issues.json14
-rw-r--r--tests/src/Loader/ContextualReflection/ContextualReflection.cs4
-rw-r--r--tests/src/Loader/ContextualReflection/ContextualReflectionDependency.cs1
3 files changed, 17 insertions, 2 deletions
diff --git a/tests/CoreFX/CoreFX.issues.json b/tests/CoreFX/CoreFX.issues.json
index b0eb61c7d4..e8428f5a92 100644
--- a/tests/CoreFX/CoreFX.issues.json
+++ b/tests/CoreFX/CoreFX.issues.json
@@ -1150,6 +1150,20 @@
}
},
{
+ "name": "System.Runtime.Loader.DefaultContext.Tests",
+ "enabled": true,
+ "exclusions": {
+ "namespaces": null,
+ "classes": null,
+ "methods": [
+ {
+ "name" : "System.Runtime.Loader.Tests.DefaultLoadContextTests.LoadInDefaultContext",
+ "reason" : "Waiting for https://github.com/dotnet/corefx/pull/37071"
+ }
+ ]
+ }
+ },
+ {
"name": "System.Runtime.Loader.Tests",
"enabled": true,
"exclusions": {
diff --git a/tests/src/Loader/ContextualReflection/ContextualReflection.cs b/tests/src/Loader/ContextualReflection/ContextualReflection.cs
index 1612c141b2..2c1d081db6 100644
--- a/tests/src/Loader/ContextualReflection/ContextualReflection.cs
+++ b/tests/src/Loader/ContextualReflection/ContextualReflection.cs
@@ -321,6 +321,9 @@ namespace ContextualReflectionTest
{
TestAssemblyLoad(isolated, (string assemblyName) => Assembly.Load(assemblyName));
TestAssemblyLoad(isolated, (string assemblyName) => Assembly.Load(new AssemblyName(assemblyName)));
+#pragma warning disable 618
+ TestAssemblyLoad(isolated, (string assemblyName) => Assembly.LoadWithPartialName(assemblyName));
+#pragma warning restore 618
}
void TestAssemblyLoad(bool isolated, Func<string, Assembly> assemblyLoad)
@@ -748,7 +751,6 @@ namespace ContextualReflectionTest
TestMockAssemblyThrows();
}
- [MethodImplAttribute(MethodImplOptions.NoInlining)]
public void RunTestsIsolated()
{
VerifyIsolationAlc();
diff --git a/tests/src/Loader/ContextualReflection/ContextualReflectionDependency.cs b/tests/src/Loader/ContextualReflection/ContextualReflectionDependency.cs
index f498db49a7..933194a304 100644
--- a/tests/src/Loader/ContextualReflection/ContextualReflectionDependency.cs
+++ b/tests/src/Loader/ContextualReflection/ContextualReflectionDependency.cs
@@ -16,7 +16,6 @@ namespace ContextualReflectionTest
Assembly alcAssembly { get; }
Type alcProgramType { get; }
IProgram alcProgramInstance { get; }
- [MethodImplAttribute(MethodImplOptions.NoInlining)]
void RunTestsIsolated();
}