Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4

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

@@ -38,7 +38,7 @@ namespace MonoTests.System.Runtime.CompilerServices
 	[TestFixture]
 	public class AsyncTaskMethodBuilderTest
 	{
-#if !MONOTOUCH
+#if !MONOTOUCH && !MOBILE_STATIC
 		// For some reason MT excludes CallContext handling
 
 		[Test]

mcs/class/corlib/Test/System.Runtime.CompilerServices/ChangeLog

@@ -1,51 +0,0 @@
-2010-06-21 Rodrigo Kumpera  <rkumpera@novell.com>
-
-	* ConditionalWeakTableTest.cs: Make test more resilient.
-
-2010-06-18 Rodrigo Kumpera  <rkumpera@novell.com>
-
-	* ConditionalWeakTableTest.cs: Fix another test.
-
-2010-06-18 Rodrigo Kumpera  <rkumpera@novell.com>
-
-	* ConditionalWeakTableTest.cs: Fix it.
-
-2010-05-11 Rodrigo Kumpera  <rkumpera@novell.com>
-
-	* ConditionalWeakTableTest.cs: New test suite.
-
-2009-10-15  Sebastien Pouliot  <sebastien@ximian.com>
-
-	* RuntimeHelpersTest.cs: Add more test cases for validations
-
-2009-06-20  Zoltan Varga  <vargaz@gmail.com>
-
-	* *.cs: Convert all tests to new-style nunit classes/methods.
-
-2009-06-10  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* InternalVisibleToAttributeTest.cs: Added test for .ctor and
-	AllInternalsVisible property.
-
-2006-11-01  Sebastien Pouliot  <sebastien@ximian.com>
-
-	* RuntimeWrappedExceptionCas.cs: New. CAS tests for 
-	RuntimeWrappedException.
-	* RuntimeWrappedExceptionTest.cs: New. Unit tests for 
-	RuntimeWrappedException.
-
-2003-04-18  Zoltan Varga  <vargaz@freemail.hu>
-
-	* RuntimeHelpersTest.cs: Added tests for Equals() and GetHashCode ()
-	methods.
-
-2002-12-21  Nick Drochak <ndrochak@gol.com>
-
-	* all: make tests build and run under nunit2
-
-2002-09-21  Zoltan Varga  <vargaz@freemail.hu>
-
-	* AllTests.cs: new file
-
-	* RuntimeHelpersTest.cs: new file
-

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

@@ -36,6 +36,7 @@ using System.Runtime.Serialization;
 using System.Security.Permissions;
 using System.Collections.Generic;
 using System.Threading;
+using MonoTests.Helpers;
 
 
 namespace MonoTests.System.Runtime.CompilerServices {
@@ -197,11 +198,9 @@ namespace MonoTests.System.Runtime.CompilerServices {
 		var cwt = new ConditionalWeakTable <object,object> ();
 		List<object> keepAlive = null;
 		List<WeakReference> keys = null;
-		Thread t = new Thread (delegate () {
+		FinalizerHelpers.PerformNoPinAction (delegate () {
 				FillStuff (cwt, out keepAlive, out keys);
 			});
-		t.Start ();
-		t.Join ();
 
 		GC.Collect ();
 
@@ -254,10 +253,7 @@ namespace MonoTests.System.Runtime.CompilerServices {
 		cwt.Add (b, new object ());
 
 		List<WeakReference> res = null;
-		ThreadStart dele = () => { res = FillWithNetwork (cwt); };
-		var th = new Thread(dele);
-		th.Start ();
-		th.Join ();
+		FinalizerHelpers.PerformNoPinAction (() => { res = FillWithNetwork (cwt); });
 
 		GC.Collect ();
 		GC.Collect ();
@@ -301,16 +297,12 @@ namespace MonoTests.System.Runtime.CompilerServices {
 		List<WeakReference> res, res2;
 		res = res2 = null;
 
-		ThreadStart dele = () => {
+		FinalizerHelpers.PerformNoPinAction (() => {
 			res = FillWithNetwork2 (cwt);
 			ForcePromotion ();
 			k = FillReachable (cwt);
 			res2 = FillWithNetwork2 (cwt);
-		};
-
-		var th = new Thread(dele);
-		th.Start ();
-		th.Join ();
+		});
 
 		GC.Collect ();
 
@@ -445,10 +437,7 @@ namespace MonoTests.System.Runtime.CompilerServices {
 			Assert.Ignore ("Not working on Boehm.");
 		lock (_lock1) { 
 			var cwt = new ConditionalWeakTable <object,object> ();
-			ThreadStart dele = () => { FillWithFinalizable (cwt); };
-			var th = new Thread(dele);
-			th.Start ();
-			th.Join ();
+			FinalizerHelpers.PerformNoPinAction (() => { FillWithFinalizable (cwt); });
 			GC.Collect ();
 			GC.Collect ();
 

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

@@ -248,6 +248,7 @@ namespace MonoTests.System.Runtime.CompilerServices
 			return res.Result;
 		}
 
+#if !MOBILE_STATIC
 		[Test]
 		public void FinishedTaskOnCompleted ()
 		{
@@ -272,6 +273,8 @@ namespace MonoTests.System.Runtime.CompilerServices
 			Assert.AreEqual (Thread.CurrentThread.IsBackground, mres2.WaitOne (2000), "#2");;
 		}
 
+#endif
+
 		[Test]
 		public void CompletionOnSameCustomSynchronizationContext ()
 		{