New attempt at fixing the tests. No review.

2 files changed, 85 insertions, 0 deletions

diff --git a/test/pending/jvm/actor-executor4.check b/test/pending/jvm/actor-executor4.check
new file mode 100644
index 0000000000..da78f45836
--- /dev/null
+++ b/test/pending/jvm/actor-executor4.check
@@ -0,0 +1,21 @@
+Two: OK
+One: OK
+Two: OK
+One: OK
+Two: OK
+One: OK
+Two: OK
+One: OK
+Two: OK
+One: OK
+Two: OK
+One: OK
+Two: OK
+One: OK
+Two: OK
+One: OK
+Two: OK
+One: OK
+Two: OK
+One: OK
+One exited
diff --git a/test/pending/jvm/actor-executor4.scala b/test/pending/jvm/actor-executor4.scala
new file mode 100644
index 0000000000..a912d76094
--- /dev/null
+++ b/test/pending/jvm/actor-executor4.scala
@@ -0,0 +1,64 @@
+import scala.actors.{Actor, Exit}
+import scala.actors.scheduler.ExecutorScheduler
+import java.util.concurrent.Executors
+
+object One extends AdaptedActor {
+  def act() {
+    Two.start()
+    var i = 0
+    loopWhile (i < Test.NUM_MSG) {
+      i += 1
+      Two ! 'MsgForTwo
+      react {
+        case 'MsgForOne =>
+          if (i % (Test.NUM_MSG/10) == 0)
+            println("One: OK")
+      }
+    }
+  }
+}
+
+object Two extends AdaptedActor {
+  def act() {
+    var i = 0
+    loopWhile (i < Test.NUM_MSG) {
+      i += 1
+      react {
+        case 'MsgForTwo =>
+          if (i % (Test.NUM_MSG/10) == 0)
+            println("Two: OK")
+          One ! 'MsgForOne
+      }
+    }
+  }
+}
+
+trait AdaptedActor extends Actor {
+  override def scheduler =
+    Test.scheduler
+}
+
+object Test {
+  val NUM_MSG = 100000
+
+  val scheduler =
+    ExecutorScheduler(
+      Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()),
+      false)
+
+  def main(args: Array[String]) {
+    (new AdaptedActor {
+      def act() {
+        trapExit = true
+        link(One)
+        One.start()
+
+        receive {
+          case Exit(from, reason) =>
+            println("One exited")
+            Test.scheduler.shutdown()
+        }
+      }
+    }).start()
+  }
+}