Hardened actor tests. No review.

1 files changed, 10 insertions, 0 deletions

diff --git a/test/files/jvm/actor-exceptions.scala b/test/files/jvm/actor-exceptions.scala
index 77bf05c048..384226d777 100644
--- a/test/files/jvm/actor-exceptions.scala
+++ b/test/files/jvm/actor-exceptions.scala
@@ -13,12 +13,17 @@ case class MyOtherException(text: String) extends Exception {
 object Master extends Actor {
   trapExit = true
   def act() {
+    try {
     link(Slave)
     Slave.start()
     for (i <- 0 until 10) Slave ! A
     react {
       case Exit(from, reason) =>
     }
+    } catch {
+      case e: Throwable if !e.isInstanceOf[scala.util.control.ControlThrowable] =>
+        e.printStackTrace()
+    }
   }
 }
 
@@ -28,6 +33,7 @@ object Slave extends Actor {
     case MyException(text) =>
   }
   def act() {
+    try {
     var cnt = 0
     loop {
       react {
@@ -39,6 +45,10 @@ object Slave extends Actor {
           }
       }
     }
+    } catch {
+      case e: Throwable if !e.isInstanceOf[scala.util.control.ControlThrowable] =>
+        e.printStackTrace()
+    }
   }
 }