summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2009-02-11 00:50:39 +0000
committerPaul Phillips <paulp@improving.org>2009-02-11 00:50:39 +0000
commit4fdfc29d7e1fb769ddc7d7999a90e31627d1a6d4 (patch)
tree7ce70e221bd9944d1c7d92de2197c5d594abcf68 /test/files
parent347e682ba28c6cbec3169b450074b4f1d2fd4bd9 (diff)
downloadscala-4fdfc29d7e1fb769ddc7d7999a90e31627d1a6d4.tar.gz
scala-4fdfc29d7e1fb769ddc7d7999a90e31627d1a6d4.tar.bz2
scala-4fdfc29d7e1fb769ddc7d7999a90e31627d1a6d4.zip
moved timeout.scala back to pending and documen...
moved timeout.scala back to pending and documented why it's there
Diffstat (limited to 'test/files')
-rw-r--r--test/files/jvm/timeout.check1
-rw-r--r--test/files/jvm/timeout.scala5
2 files changed, 5 insertions, 1 deletions
diff --git a/test/files/jvm/timeout.check b/test/files/jvm/timeout.check
deleted file mode 100644
index d86bac9de5..0000000000
--- a/test/files/jvm/timeout.check
+++ /dev/null
@@ -1 +0,0 @@
-OK
diff --git a/test/files/jvm/timeout.scala b/test/files/jvm/timeout.scala
index 12f1bd7bad..3005beab2c 100644
--- a/test/files/jvm/timeout.scala
+++ b/test/files/jvm/timeout.scala
@@ -1,3 +1,8 @@
+// Test is in pending because although it suceeds locally,
+// it takes too long on the machine which runs nightly tests.
+//
+// [partest] EXPECTED: 100 < x < 900
+// [partest] ACTUAL: 1519
import scala.actors.Actor._
import scala.actors.TIMEOUT