Imported Upstream version 6.0.0.172

Former-commit-id: f3cc9b82f3e5bd8f0fd3ebc098f789556b44e9cd

mcs/class/corlib/Test/System.Threading/CancellationTokenSourceTest.cs

@@ -50,6 +50,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void Ctor_Timeout ()
 		{
 			int called = 0;
@@ -62,6 +63,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void CancelAfter ()
 		{
 			int called = 0;
@@ -379,6 +381,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void RegisterWhileCancelling ()
 		{
 			var cts = new CancellationTokenSource ();

mcs/class/corlib/Test/System.Threading/CountdownEventTests.cs

@@ -295,6 +295,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void Signal_Concurrent ()
 		{
 			for (int r = 0; r < 100; ++r) {

mcs/class/corlib/Test/System.Threading/ManualResetEventSlimTests.cs

@@ -109,6 +109,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void Wait_SetConcurrent ()
 		{
 			for (int i = 0; i < 10000; ++i) {
@@ -129,6 +130,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void Wait_DisposeWithCancel ()
 		{
 			var token = new CancellationTokenSource ();
@@ -159,6 +161,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void SetAfterDisposeTest ()
 		{
 			ParallelTestHelper.Repeat (delegate {
@@ -221,6 +224,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void WaitHandleConsistencyTest ()
 		{
 			var mre = new ManualResetEventSlim ();
@@ -240,6 +244,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void WaitWithCancellationTokenAndNotImmediateSetTest ()
 		{
 			var mres = new ManualResetEventSlim ();
@@ -249,6 +254,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void WaitWithCancellationTokenAndCancel ()
 		{
 			var mres = new ManualResetEventSlim ();

mcs/class/corlib/Test/System.Threading/ThreadPoolTest.cs

@@ -82,6 +82,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void QueueUserWorkItem ()
 		{
 			int n = 100000;
@@ -102,6 +103,7 @@ namespace MonoTests.System.Threading
 		event WaitCallback e;
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void UnsafeQueueUserWorkItem_MulticastDelegate ()
 		{
 			CountdownEvent ev = new CountdownEvent (2);
@@ -119,6 +121,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void SetAndGetMinThreads ()
 		{
 			int workerThreads, completionPortThreads;
@@ -138,6 +141,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void SetAndGetMaxThreads ()
 		{
 			int cpuCount = Environment.ProcessorCount;
@@ -158,6 +162,7 @@ namespace MonoTests.System.Threading
 		}
 		
 		[Test]
+		[Category ("MultiThreaded")]
 		public void SetMaxPossibleThreads ()
 		{
 			var maxPossibleThreads = 0x7fff;
@@ -175,6 +180,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void GetAvailableThreads ()
 		{
 			int cpuCount = Environment.ProcessorCount;
@@ -223,6 +229,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void AsyncLocalCapture ()
 		{
 			var asyncLocal = new AsyncLocal<int>();
@@ -288,6 +295,7 @@ namespace MonoTests.System.Threading
 #endif
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void SetMinThreads ()
 		{
 			int workerThreads, cpThreads;

mcs/class/corlib/Test/System.Threading/ThreadPrincipalTests.cs

@@ -14,6 +14,7 @@ namespace MonoTests.System.Threading.Tasks
 
 #if !MONOTOUCH // Uses LogicalCallContext
         [Test]
+		[Category ("MultiThreaded")]
         public void PrincipalFlowsToAsyncTask ()
         {
             /* run in different thread to work around problems on platforms

mcs/class/corlib/Test/System.Threading/ThreadTest.cs

@@ -309,6 +309,7 @@ namespace MonoTests.System.Threading
 
 		[Test]
 		[Category ("NotDotNet")] // it hangs.
+		[Category ("MultiThreaded")]
 		public void TestStart()
 		{
 		{
@@ -452,6 +453,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void TestUndivisibleByPageSizeMaxStackSize ()
 		{
 			const int undivisible_stacksize = 1048573;
@@ -833,6 +835,7 @@ namespace MonoTests.System.Threading
 #endif
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void Test_Interrupt ()
 		{
 			ManualResetEvent mre = new ManualResetEvent (false);

mcs/class/corlib/Test/System.Threading/TimerTest.cs

@@ -15,6 +15,7 @@ using System.Collections;
 
 namespace MonoTests.System.Threading {
 	[TestFixture]
+	[Category ("MultiThreaded")]
 	public class TimerTest {
 		// this bucket is used to avoid non-theadlocal issues
 		class Bucket {