summaryrefslogtreecommitdiff
path: root/test/files/jvm/t7146.check
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-02-27 15:22:50 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-02-27 15:22:50 -0800
commit65a5459b0c3ae7daa16a283733ff0070f3ef21ab (patch)
treec0f1e90291f282a46a4e898d725f6f8d9eb497af /test/files/jvm/t7146.check
parent4265ee8f3846262c778c0e1e6184b3a23f18ec2a (diff)
parent234d05d52b5a2985e53f9cb6877001b3c8fc780e (diff)
downloadscala-65a5459b0c3ae7daa16a283733ff0070f3ef21ab.tar.gz
scala-65a5459b0c3ae7daa16a283733ff0070f3ef21ab.tar.bz2
scala-65a5459b0c3ae7daa16a283733ff0070f3ef21ab.zip
Merge branch 2.10.1 into master
Conflicts: src/compiler/scala/tools/nsc/ast/Trees.scala src/library/scala/concurrent/impl/ExecutionContextImpl.scala
Diffstat (limited to 'test/files/jvm/t7146.check')
-rw-r--r--test/files/jvm/t7146.check5
1 files changed, 5 insertions, 0 deletions
diff --git a/test/files/jvm/t7146.check b/test/files/jvm/t7146.check
new file mode 100644
index 0000000000..7c76040205
--- /dev/null
+++ b/test/files/jvm/t7146.check
@@ -0,0 +1,5 @@
+should be scala.concurrent.impl.ExecutionContextImpl == true
+should be scala.concurrent.forkjoin.ForkJoinPool == true
+should have non-null UncaughtExceptionHandler == true
+should be a scala.concurrent.impl.ExecutionContextImpl UncaughtExceptionHandler == true
+should just print out on uncaught == true