Imported Upstream version 6.4.0.137

Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6

mcs/class/corlib/Test/System.Collections/CaseInsensitiveComparerTest.cs

@@ -33,6 +33,7 @@ namespace MonoTests.System.Collections {
 		}
 
 		[Test]
+		[Category ("ManagedCollator")]
 		public void TestCompare_Culture ()
 		{
 			CultureInfo originalCulture = Thread.CurrentThread.CurrentCulture;

mcs/class/corlib/Test/System.Collections/CaseInsensitiveHashCodeProviderTest.cs

@@ -80,6 +80,7 @@ namespace MonoTests.System.Collections
 		}
 
 		[Test]
+		[Category ("ManagedCollator")]
 		public void HashCode ()
 		{
 			CaseInsensitiveHashCodeProvider cih = new CaseInsensitiveHashCodeProvider ();

mcs/class/corlib/Test/System.Collections/ComparerTest.cs

@@ -51,6 +51,7 @@ namespace MonoTests.System.Collections {
 		}
 
 		[Test]
+		[Category ("ManagedCollator")]
 		public void Invariant ()
 		{
 			Comparer c = Comparer.DefaultInvariant;
@@ -71,6 +72,7 @@ namespace MonoTests.System.Collections {
 		}
 
 		[Test]
+		[Category ("ManagedCollator")]
 		public void Constructor ()
 		{
 			Comparer c = new Comparer (CultureInfo.InvariantCulture);

mcs/class/corlib/Test/System.Collections/HashtableTest.cs

@@ -532,6 +532,7 @@ public class HashtableTest {
 	}
 	
 	[Test]
+	[Category ("Remoting")]
 	public void TestSerialization2 () {
 		// Test from bug #70570
 		MemoryStream stream = new MemoryStream();
@@ -723,7 +724,8 @@ public class HashtableTest {
 	///  Test hashtable with CaseInsensitiveHashCodeProvider
 	///  and CaseInsensitive comparer.
 	/// </summary>
-        [Test]        
+	[Test]
+	[Category ("ManagedCollator")]
 	public void TestCaseInsensitive ()
 	{
 		// Not very meaningfull test, just to make