Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions
--- a/mcs/class/corlib/Test/System.Threading/ThreadLocalTests.cs
+++ b/mcs/class/corlib/Test/System.Threading/ThreadLocalTests.cs
@ -1,4 +1,3 @@
-#if NET_4_0
 // 
 // ThreadLazyTests.cs
 //  
@ -194,6 +193,9 @@ namespace MonoTests.System.Threading
 		}

 		[Test]
+#if MONOTOUCH
+		[Category ("NotWorking")] // https://bugzilla.xamarin.com/show_bug.cgi?id=34617
+#endif
 		public void DisposeOnThreadExit ()
 		{
 			var threadLocal = new ThreadLocal<SetMreOnFinalize>();
@ -215,4 +217,3 @@ namespace MonoTests.System.Threading
 		}
 	}
 }
-#endif