diff options
-rw-r--r-- | src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala | 4 | ||||
-rw-r--r-- | test/files/presentation/simple-tests.check (renamed from test/disabled/presentation/simple-tests.check) | 0 | ||||
-rw-r--r-- | test/files/presentation/simple-tests.javaopts (renamed from test/disabled/presentation/simple-tests.javaopts) | 0 | ||||
-rw-r--r-- | test/files/presentation/simple-tests/SimpleInteractiveTest.scala (renamed from test/disabled/presentation/simple-tests/SimpleInteractiveTest.scala) | 0 | ||||
-rw-r--r-- | test/files/presentation/simple-tests/src/Tester.scala (renamed from test/disabled/presentation/simple-tests/src/Tester.scala) | 0 |
5 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala b/src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala index 526919f067..4345c83014 100644 --- a/src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala +++ b/src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala @@ -2,7 +2,7 @@ package scala.tools.nsc.interactive package tests import scala.tools.nsc.Settings -import scala.tools.nsc.reporters.ConsoleReporter +import scala.tools.nsc.reporters.StoreReporter import scala.tools.nsc.util.{BatchSourceFile, SourceFile, Position} import scala.tools.nsc.io._ @@ -41,7 +41,7 @@ abstract class InteractiveTest { val TIMEOUT = 10000 // timeout in milliseconds val settings = new Settings - val reporter= new ConsoleReporter(settings) + val reporter= new StoreReporter // need this so that the classpath comes from what partest // instead of scala.home diff --git a/test/disabled/presentation/simple-tests.check b/test/files/presentation/simple-tests.check index a1fbddfa2a..a1fbddfa2a 100644 --- a/test/disabled/presentation/simple-tests.check +++ b/test/files/presentation/simple-tests.check diff --git a/test/disabled/presentation/simple-tests.javaopts b/test/files/presentation/simple-tests.javaopts index 4af888f9c2..4af888f9c2 100644 --- a/test/disabled/presentation/simple-tests.javaopts +++ b/test/files/presentation/simple-tests.javaopts diff --git a/test/disabled/presentation/simple-tests/SimpleInteractiveTest.scala b/test/files/presentation/simple-tests/SimpleInteractiveTest.scala index 014fd24b6f..014fd24b6f 100644 --- a/test/disabled/presentation/simple-tests/SimpleInteractiveTest.scala +++ b/test/files/presentation/simple-tests/SimpleInteractiveTest.scala diff --git a/test/disabled/presentation/simple-tests/src/Tester.scala b/test/files/presentation/simple-tests/src/Tester.scala index cb62187514..cb62187514 100644 --- a/test/disabled/presentation/simple-tests/src/Tester.scala +++ b/test/files/presentation/simple-tests/src/Tester.scala |