Imported Upstream version 6.0.0.172

Former-commit-id: f3cc9b82f3e5bd8f0fd3ebc098f789556b44e9cd

mcs/class/corlib/Test/System.Runtime.CompilerServices/ConditionalWeakTableTest.cs

@@ -293,6 +293,7 @@ namespace MonoTests.System.Runtime.CompilerServices {
 
 	[Test]
 	[Category ("MultiThreaded")]
+	[Category ("NotWorkingRuntimeInterpreter")] // Flaky due to false pinning
 	public void OldGenStress () {
 		if (GC.MaxGeneration == 0) /*Boehm doesn't handle ephemerons */
 			Assert.Ignore ("Not working on Boehm.");

mcs/class/corlib/Test/System.Runtime.CompilerServices/TaskAwaiterTest.cs

@@ -160,6 +160,7 @@ namespace MonoTests.System.Runtime.CompilerServices
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void GetResultFaulted ()
 		{
 			TaskAwaiter awaiter;
@@ -179,6 +180,7 @@ namespace MonoTests.System.Runtime.CompilerServices
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void GetResultCanceled ()
 		{
 			TaskAwaiter awaiter;
@@ -208,6 +210,7 @@ namespace MonoTests.System.Runtime.CompilerServices
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void CustomScheduler ()
 		{
 			// some test runners (e.g. Touch.Unit) will execute this on the main thread and that would lock them
@@ -250,6 +253,7 @@ namespace MonoTests.System.Runtime.CompilerServices
 
 		[Test]
 		[Ignore ("Incompatible with nunitlite")]
+		[Category ("MultiThreaded")]
 		public void FinishedTaskOnCompleted ()
 		{
 			var mres = new ManualResetEvent (false);

mcs/class/corlib/Test/System.Runtime.CompilerServices/TaskAwaiterTest_T.cs

@@ -135,6 +135,7 @@ namespace MonoTests.System.Runtime.CompilerServices
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void ContextTest ()
 		{
 			TaskAwaiter awaiter;

mcs/class/corlib/Test/System.Runtime.CompilerServices/YieldAwaitableTest.cs

@@ -124,6 +124,7 @@ namespace MonoTests.System.Runtime.CompilerServices
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void OnCompleted_2 ()
 		{
 			TaskScheduler scheduler = null;
@@ -164,6 +165,7 @@ namespace MonoTests.System.Runtime.CompilerServices
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void OnCompleted_4 ()
 		{
 			SynchronizationContext context_ran = null;