[wasm] test cleanup (#15727)

* [wasm] stop excluding test_0_large_nullable_invoke on wasm

* [wasm] remove wasm exclusion from test_0_simple_double_casts

* Add category MultiThreaded to more of the concurrent collection tests

* Add more MultiThreaded annotations to HttpListener2Test

* Add category MultiThreaded to HttpWebRequestTest

* [wasm] flag more tests that are taking down the runtime

* [wasm] force sockets to throw PNSE in the ctor for now

* [wasm] enable corlib interpreter tests

* [wasm] Increase timeout for corlib tests

* try to fix wasm-cross-win-release-configure on macos

13 files changed, 24 insertions, 1 deletions

diff --git a/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs b/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs
index 5c435556190..aa4b71c7126 100644
--- a/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs
+++ b/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs
@@ -250,6 +250,7 @@ namespace MonoTests.System.Collections.Concurrent
 		}
 
 		[Test, ExpectedException (typeof(OperationCanceledException))]
+		[Category ("MultiThreaded")]
 		public void BoundedAddLimit ()
 		{
 			const int elNumber = 5;
diff --git a/mcs/class/System/Test/System.Collections.Concurrent/ConcurrentBagTests.cs b/mcs/class/System/Test/System.Collections.Concurrent/ConcurrentBagTests.cs
index af23b5137bc..223c5207dba 100644
--- a/mcs/class/System/Test/System.Collections.Concurrent/ConcurrentBagTests.cs
+++ b/mcs/class/System/Test/System.Collections.Concurrent/ConcurrentBagTests.cs
@@ -241,12 +241,14 @@ namespace MonoTests.System.Collections.Concurrent
         }
 		
 		[Test]
+		[Category("MultiThreaded")]
 		public void AddStressTest ()
 		{
 			CollectionStressTestHelper.AddStressTest (bag);
 		}
 		
 		[Test]
+		[Category("MultiThreaded")]
 		public void RemoveStressTest ()
 		{
 			CollectionStressTestHelper.RemoveStressTest (bag, CheckOrderingType.DontCare);
diff --git a/mcs/class/System/Test/System.Net.NetworkInformation/PingTest.cs b/mcs/class/System/Test/System.Net.NetworkInformation/PingTest.cs
index 2cbdb6838ca..6b759a06b8c 100644
--- a/mcs/class/System/Test/System.Net.NetworkInformation/PingTest.cs
+++ b/mcs/class/System/Test/System.Net.NetworkInformation/PingTest.cs
@@ -7,6 +7,7 @@ using System.Threading;
 namespace MonoTests.System.Net.NetworkInformation
 {
 	[TestFixture]
+	[Category("NotWasm")]
 	public partial class PingTest
 	{
 		partial void AndroidShouldPingWork (ref bool shouldWork);
@@ -89,6 +90,7 @@ namespace MonoTests.System.Net.NetworkInformation
 		}
 
 		[Test]
+		[Category("MultiThreaded")]
 #if MONOTOUCH
 		[Ignore("Ping implementation is broken on MT (requires sudo access)")]
 #endif
@@ -106,6 +108,7 @@ namespace MonoTests.System.Net.NetworkInformation
 		}
 
 		[Test]
+		[Category("MultiThreaded")]
 #if MONOTOUCH
 		[Ignore("Ping implementation is broken on MT (requires sudo access)")]
 #endif
diff --git a/mcs/class/System/Test/System.Net.Sockets/IPv6MulticastOptionTest.cs b/mcs/class/System/Test/System.Net.Sockets/IPv6MulticastOptionTest.cs
index 37a39153694..903c23440d1 100644
--- a/mcs/class/System/Test/System.Net.Sockets/IPv6MulticastOptionTest.cs
+++ b/mcs/class/System/Test/System.Net.Sockets/IPv6MulticastOptionTest.cs
@@ -15,6 +15,7 @@ using NUnit.Framework;
 namespace MonoTests.System.Net.Sockets
 {
 	[TestFixture]
+	[Category("NotWasm")]
 	public class IPv6MulticastOptionTest
 	{
 		[Test] // .ctor (IPAddress)
diff --git a/mcs/class/System/Test/System.Net.Sockets/MulticastOptionTest.cs b/mcs/class/System/Test/System.Net.Sockets/MulticastOptionTest.cs
index 3734c5b2d10..42bff4f3eac 100644
--- a/mcs/class/System/Test/System.Net.Sockets/MulticastOptionTest.cs
+++ b/mcs/class/System/Test/System.Net.Sockets/MulticastOptionTest.cs
@@ -15,6 +15,7 @@ using NUnit.Framework;
 namespace MonoTests.System.Net.Sockets
 {
 	[TestFixture]
+	[Category("NotWasm")]
 	public class MulticastOptionTest
 	{
 		[Test] // .ctor (IPAddress)
diff --git a/mcs/class/System/Test/System.Net.Sockets/SocketTest.cs b/mcs/class/System/Test/System.Net.Sockets/SocketTest.cs
index 32adec28b20..49bafdc0066 100755
--- a/mcs/class/System/Test/System.Net.Sockets/SocketTest.cs
+++ b/mcs/class/System/Test/System.Net.Sockets/SocketTest.cs
@@ -28,6 +28,7 @@ using MonoTests.Helpers;
 namespace MonoTests.System.Net.Sockets
 {
 	[TestFixture]
+	[Category("NotWasm")]
 	public class SocketTest
 	{
 		public const string BogusAddress = "192.168.244.244";
diff --git a/mcs/class/System/Test/System.Net/FileWebRequestTest.cs b/mcs/class/System/Test/System.Net/FileWebRequestTest.cs
index 869666699b0..ab2d6033539 100644
--- a/mcs/class/System/Test/System.Net/FileWebRequestTest.cs
+++ b/mcs/class/System/Test/System.Net/FileWebRequestTest.cs
@@ -26,6 +26,7 @@ using MonoTests.Helpers;
 namespace MonoTests.System.Net
 {
 	[TestFixture]
+	[Category("NotWasm")]
 	public class FileWebRequestTest
 	{
 		private TempDirectory _tempDirectory;
diff --git a/mcs/class/System/Test/System.Net/FileWebResponseTest.cs b/mcs/class/System/Test/System.Net/FileWebResponseTest.cs
index 97f1f33a6f6..6172e8b5539 100644
--- a/mcs/class/System/Test/System.Net/FileWebResponseTest.cs
+++ b/mcs/class/System/Test/System.Net/FileWebResponseTest.cs
@@ -19,6 +19,7 @@ using MonoTests.Helpers;
 namespace MonoTests.System.Net
 {
 	[TestFixture]
+	[Category("NotWasm")]
 	public class FileWebResponseTest
 	{
 		private TempDirectory _tempDirectory;
diff --git a/mcs/class/System/Test/System.Net/HttpListener2Test.cs b/mcs/class/System/Test/System.Net/HttpListener2Test.cs
index c3d3822f95a..4a09e4881bd 100644
--- a/mcs/class/System/Test/System.Net/HttpListener2Test.cs
+++ b/mcs/class/System/Test/System.Net/HttpListener2Test.cs
@@ -364,6 +364,7 @@ namespace MonoTests.System.Net {
 		ManualResetEvent test_evt;
 		bool test14_error;
 		[Test]
+		[Category("MultiThreaded")]
 #if FEATURE_NO_BSD_SOCKETS
 		[ExpectedException (typeof (PlatformNotSupportedException))]
 #endif
@@ -502,6 +503,7 @@ namespace MonoTests.System.Net {
 		}
 
 		[Test]
+		[Category("MultiThreaded")]
 #if FEATURE_NO_BSD_SOCKETS
 		[ExpectedException (typeof (PlatformNotSupportedException))]
 #endif
@@ -550,6 +552,7 @@ namespace MonoTests.System.Net {
 		}
 
 		[Test]
+		[Category("MultiThreaded")]
 #if FEATURE_NO_BSD_SOCKETS
 		[ExpectedException (typeof (PlatformNotSupportedException))]
 #endif
@@ -603,6 +606,7 @@ namespace MonoTests.System.Net {
 		}
 
 		[Test]
+		[Category("MultiThreaded")]
 #if FEATURE_NO_BSD_SOCKETS
 		[ExpectedException (typeof (PlatformNotSupportedException))]
 #endif
@@ -762,6 +766,7 @@ namespace MonoTests.System.Net {
 		// Test case for bug 341443, an pretty old bug, filed on November of 2007.
 		//
 		[Test]
+		[Category("MultiThreaded")]
 #if FEATURE_NO_BSD_SOCKETS
 		[ExpectedException (typeof (PlatformNotSupportedException))]
 #endif
diff --git a/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs b/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs
index 0252b387e04..8140e6616df 100644
--- a/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs
+++ b/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs
@@ -1399,6 +1399,7 @@ namespace MonoTests.System.Net
 		}
 
 		[Test] // 1st possible case of https://bugzilla.novell.com/show_bug.cgi?id=MONO74177
+		[Category("MultiThreaded")]
 #if FEATURE_NO_BSD_SOCKETS
 		[ExpectedException (typeof (PlatformNotSupportedException))]
 #endif
@@ -1412,6 +1413,7 @@ namespace MonoTests.System.Net
 		}
 
 		[Test] // 2nd possible case of https://bugzilla.novell.com/show_bug.cgi?id=MONO74177
+		[Category("MultiThreaded")]
 		[Category ("RequiresBSDSockets")] // Requires some test refactoring to assert that a PlatformNotSupportedException is thrown, so don't bother (there's plenty of other tests asserting the PlatformNotSupported exceptions).
 		public void TestTimeoutWithEndpointThatDoesntExistThrowsConnectFailureBeforeTimeout ()
 		{
@@ -1667,6 +1669,7 @@ namespace MonoTests.System.Net
 			return Encoding.UTF8.GetBytes (sw.ToString ());
 		}
 		[Test]
+		[Category("MultiThreaded")]
 #if FEATURE_NO_BSD_SOCKETS
 		[ExpectedException (typeof (PlatformNotSupportedException))]
 #endif
diff --git a/mcs/class/System/Test/System.Net/WebRequestTest.cs b/mcs/class/System/Test/System.Net/WebRequestTest.cs
index 57115d810bb..4493b8ebdf6 100644
--- a/mcs/class/System/Test/System.Net/WebRequestTest.cs
+++ b/mcs/class/System/Test/System.Net/WebRequestTest.cs
@@ -326,7 +326,8 @@ namespace MonoTests.System.Net {
 	[Test] //BNC#323452

 	// Throws exception with Status == Timeout. The same code behaves as the test expects when run from a regular app.

 	// Might be an issue with the test suite. To investigate.

-	[Category("AndroidNotWorking")] 

+	[Category("AndroidNotWorking")]

+	[Category("MultiThreaded")]

 	public void TestFailedConnection ()

 	{

 		try {

@@ -353,6 +354,7 @@ namespace MonoTests.System.Net {
 

 	[Test] //BNC#323452

 	[Category ("AndroidNotWorking")] // Fails when ran as part of the entire BCL test suite. Works when only this fixture is ran

+	[Category ("MultiThreaded")]

 	public void TestFailedResolution ()

 	{

 		try {

diff --git a/mcs/class/System/Test/System.Text.RegularExpressions/RegexBugs_Long.cs b/mcs/class/System/Test/System.Text.RegularExpressions/RegexBugs_Long.cs
index 19f90a2ddd3..c732b1a7bc6 100644
--- a/mcs/class/System/Test/System.Text.RegularExpressions/RegexBugs_Long.cs
+++ b/mcs/class/System/Test/System.Text.RegularExpressions/RegexBugs_Long.cs
@@ -8,6 +8,7 @@ namespace MonoTests.System.Text.RegularExpressions
 	public class RegexBugs2
 	{		
 		[Test]
+		[Category("MultiThreaded")]
 		public void BugXamarin7578 ()
 		{			
 			string testData = @"\id aaaaaaaaaaaaaaaaa
diff --git a/mcs/class/System/Test/System.Timers/TimerTest.cs b/mcs/class/System/Test/System.Timers/TimerTest.cs
index 94f3552b6f5..00a238f2e90 100644
--- a/mcs/class/System/Test/System.Timers/TimerTest.cs
+++ b/mcs/class/System/Test/System.Timers/TimerTest.cs
@@ -329,6 +329,7 @@ namespace MonoTests.System.Timers
 		}
 
 		[Test]
+		[Category ("NotWasm")] // Object.onAbort
 		public void TestRaceCondition ()
 		{
 			Assert.IsTrue (new RaceTest (true).Success, "#1");