Hardened actor tests. No review.

1 files changed, 15 insertions, 0 deletions

diff --git a/test/files/jvm/actor-executor2.scala b/test/files/jvm/actor-executor2.scala
index 9e99e167aa..da64a7fc43 100644
--- a/test/files/jvm/actor-executor2.scala
+++ b/test/files/jvm/actor-executor2.scala
@@ -4,6 +4,7 @@ import java.util.concurrent.Executors
 
 object One extends AdaptedActor {
   def act() {
+    try {
     Two.start()
     var i = 0
     loopWhile (i < Test.NUM_MSG) {
@@ -15,11 +16,16 @@ object One extends AdaptedActor {
             println("One: OK")
       }
     }
+    } catch {
+      case e: Throwable if !e.isInstanceOf[scala.util.control.ControlThrowable] =>
+        e.printStackTrace()
+    }
   }
 }
 
 object Two extends AdaptedActor {
   def act() {
+    try {
     var i = 0
     loopWhile (i < Test.NUM_MSG) {
       i += 1
@@ -30,6 +36,10 @@ object Two extends AdaptedActor {
           One ! 'MsgForOne
       }
     }
+    } catch {
+      case e: Throwable if !e.isInstanceOf[scala.util.control.ControlThrowable] =>
+        e.printStackTrace()
+    }
   }
 }
 
@@ -54,6 +64,7 @@ object Test {
     }
 
   def main(args: Array[String]) {
+    try {
     self.trapExit = true
     link(One)
     One.start()
@@ -63,5 +74,9 @@ object Test {
         println("One exited")
         Test.executor.shutdown()
     }
+    } catch {
+      case e: Throwable if !e.isInstanceOf[scala.util.control.ControlThrowable] =>
+        e.printStackTrace()
+    }
   }
 }