summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-11-07 14:37:59 +0000
committerPaul Phillips <paulp@improving.org>2011-11-07 14:37:59 +0000
commit15b9785d30e0358fc5d58e874421ffd396886b9a (patch)
tree0e8f68438dfc62dc2130dbcde12e0c15636baa22
parent5816db58e1f370dd78b3bd9deb47f7d309641294 (diff)
downloadscala-15b9785d30e0358fc5d58e874421ffd396886b9a.tar.gz
scala-15b9785d30e0358fc5d58e874421ffd396886b9a.tar.bz2
scala-15b9785d30e0358fc5d58e874421ffd396886b9a.zip
A couple bits of r25957 lost under time pressure.
No review.
-rw-r--r--src/partest/scala/tools/partest/ReplTest.scala2
-rw-r--r--test/files/run/repl-exceptions.scala3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/partest/scala/tools/partest/ReplTest.scala b/src/partest/scala/tools/partest/ReplTest.scala
index 9c45df9ec5..c7f17ad2a3 100644
--- a/src/partest/scala/tools/partest/ReplTest.scala
+++ b/src/partest/scala/tools/partest/ReplTest.scala
@@ -18,7 +18,7 @@ abstract class ReplTest extends DirectTest {
// final because we need to enforce the existence of a couple settings.
final override def settings: Settings = {
val s = super.settings
- s.Yreplsync.value = true
+ // s.Yreplsync.value = true
s.Xnojline.value = true
transformSettings(s)
}
diff --git a/test/files/run/repl-exceptions.scala b/test/files/run/repl-exceptions.scala
index 301f3595d0..bccedeba6b 100644
--- a/test/files/run/repl-exceptions.scala
+++ b/test/files/run/repl-exceptions.scala
@@ -1,8 +1,9 @@
import scala.tools.partest.ReplTest
import scala.tools.util.Javap
+// This test blows up under -Yrepl-sync.
object Test extends ReplTest {
- override def extraSettings = "-Yrich-exceptions -Yrepl-sync"
+ override def extraSettings = "-Yrich-exceptions"
def code = """
|sys.SystemProperties.traceSourcePath setValue ""
|def f = sys.error("hi mom")