2009-11-04 Zoltan Varga <vargaz@gmail.com>

	* thread6.cs: Add a test for 539394. Convert to using the TestRunner.

svn path=/trunk/mono/; revision=145366

diff --git a/mono/tests/ChangeLog b/mono/tests/ChangeLog
index d4a8d347ddda5288a70d74eb9e4c6645ff78a2a3..437b705e351de1f0a1230af02e069b6b0069de5f 100644 (file)
--- a/mono/tests/ChangeLog
+++ b/mono/tests/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-04  Zoltan Varga  <vargaz@gmail.com>
+
+       * thread6.cs: Add a test for 539394. Convert to using the TestRunner.
+
 2009-11-03  Rodrigo Kumpera  <rkumpera@novell.com>
 
        * interface-with-static-method.il: New test for an interface with static

diff --git a/mono/tests/thread6.cs b/mono/tests/thread6.cs
index d1b6d81baff95692067048fcb5f93975f484634a..f8df7d22b16363b407448a04dcaf0d3f6750ff18 100644 (file)
--- a/mono/tests/thread6.cs
+++ b/mono/tests/thread6.cs
@@ -1,7 +1,10 @@
+//
+// 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 ();
@@ -91,6 +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 {
@@ -103,11 +110,15 @@ public class MultiThreadExceptionTest {
                if (!aborted)
                        return 2;
 
+               return 0;
+       }
+
+       public static int test_0_test_1 () {
                Thread t1 = null;
 
                lock (started) {
                        t1 = new Thread(new ThreadStart
-                                                       (MultiThreadExceptionTest.ThreadStart1));
+                                                       (Tests.ThreadStart1));
                        t1.Name = "Thread 1";
 
                        Thread.Sleep (100);
@@ -128,7 +139,10 @@ public class MultiThreadExceptionTest {
                        return 1;
                }
 
-               // Test from #68552
+               return 0;
+       }
+
+       public static int test_0_regress_68552 () {
                try {
                        try {
                                Run ();
@@ -141,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;
@@ -153,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 {