X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Ftests%2Fthread6.cs;h=f8df7d22b16363b407448a04dcaf0d3f6750ff18;hb=a1e8d3de9a3794443d27f0989f43bb96b31faf76;hp=0d25eff412d10083807a782c406a67056b62fb27;hpb=3d693eeb90339833968d66c3dc9fde2fa3ba2cef;p=mono.git

diff --git a/mono/tests/thread6.cs b/mono/tests/thread6.cs
index 0d25eff412d..f8df7d22b16 100644
--- a/mono/tests/thread6.cs
+++ b/mono/tests/thread6.cs
@@ -1,9 +1,13 @@
+//
+// thread6.cs: Thread abort tests
+//
 using System;
 using System.Threading;
 
-public class MultiThreadExceptionTest {
+public class Tests {
 
 	public static int result = 0;
+	public static object started = new object ();
 	
 	public static void ThreadStart1 () {
 		Console.WriteLine("{0} started", 
@@ -12,6 +16,9 @@ public class MultiThreadExceptionTest {
 		try {
 			try {
 				try {
+					lock (started) {
+						Monitor.Pulse (started);
+					}
 					int i = 0;
 					try {
 						while (true) {
@@ -87,7 +94,10 @@ public class MultiThreadExceptionTest {
 	}
 	
 	public static int Main() {
+		return TestDriver.RunTests (typeof (Tests));
+	}
 
+	public static int test_0_abort_current () {
 		// Check aborting the current thread
 		bool aborted = false;
 		try {
@@ -100,24 +110,39 @@ public class MultiThreadExceptionTest {
 		if (!aborted)
 			return 2;
 
-		Thread t1 = new Thread(new ThreadStart
-			(MultiThreadExceptionTest.ThreadStart1));
-		t1.Name = "Thread 1";
+		return 0;
+	}
+
+	public static int test_0_test_1 () {
+		Thread t1 = null;
 
-		Thread.Sleep (100);
-		
-		t1.Start();
+		lock (started) {
+			t1 = new Thread(new ThreadStart
+							(Tests.ThreadStart1));
+			t1.Name = "Thread 1";
+
+			Thread.Sleep (100);
 		
-		Thread.Sleep (200);
+			t1.Start();
+
+			Monitor.Wait (started);
+		}
+
+		Thread.Sleep (100);
+
 		t1.Abort ("STATETEST");
 
 		t1.Join ();
-		Console.WriteLine ("Result: " + result);
 
-		if (result != 59)
+		if (result != 59) {
+			Console.WriteLine ("Result: " + result);
 			return 1;
+		}
+
+		return 0;
+	}
 
-		// Test from #68552
+	public static int test_0_regress_68552 () {
 		try {
 			try {
 				Run ();
@@ -130,7 +155,10 @@ public class MultiThreadExceptionTest {
 			Thread.ResetAbort ();
 		}
 
-		// Test from #78024
+		return 0;
+	}
+
+	public static int test_0_regress_78024 () {
 		try {
 			regress_78024 ();
 			return 3;
@@ -142,6 +170,34 @@ public class MultiThreadExceptionTest {
 		return 0;
 	}
 
+	public class CBO : ContextBoundObject {
+		public void Run () {
+			Thread.CurrentThread.Abort ("FOO");
+		}
+	}
+
+	public static int test_0_regress_539394 () {
+		// Check that a ThreadAbortException thrown through remoting retains its
+		// abort state
+		AppDomain d = AppDomain.CreateDomain ("test");
+		CBO obj = (CBO)d.CreateInstanceFromAndUnwrap (typeof (Tests).Assembly.Location, "Tests/CBO");
+		bool success = false;
+
+		Thread t = new Thread (delegate () {
+				try {
+					obj.Run ();
+				} catch (ThreadAbortException ex) {
+					if ((string)ex.ExceptionState == "FOO")
+						success = true;
+				}
+			});
+
+		t.Start ();
+		t.Join ();
+
+		return success ? 0 : 1;
+	}
+
 	public static void Run ()
 	{
 		try {