Hardened actor tests. No review.

1 files changed, 10 insertions, 0 deletions

diff --git a/test/files/jvm/actor-normal-exit.scala b/test/files/jvm/actor-normal-exit.scala
index 40dc7b7da4..20863d5bb0 100644
--- a/test/files/jvm/actor-normal-exit.scala
+++ b/test/files/jvm/actor-normal-exit.scala
@@ -5,18 +5,28 @@ object Test {
   object Master extends Actor {
     trapExit = true
     def act() {
+      try {
       Slave.start()
       react {
         case Exit(from, reason) =>
           println("slave exited for reason " + reason)
       }
+      } catch {
+        case e: Throwable if !e.isInstanceOf[scala.util.control.ControlThrowable] =>
+          e.printStackTrace()
+      }
     }
   }
 
   object Slave extends Actor {
     def act() {
+      try {
       link(Master)
       println("Done")
+      } catch {
+        case e: Throwable if !e.isInstanceOf[scala.util.control.ControlThrowable] =>
+          e.printStackTrace()
+      }
     }
   }