diff --git a/test/files/run/repl-paste-6.check b/test/files/run/repl-paste-6.check old mode 100755 new mode 100644 diff --git a/test/files/run/repl-paste-parse.check b/test/files/run/repl-paste-parse.check deleted file mode 100755 index 02b42a4da518..000000000000 --- a/test/files/run/repl-paste-parse.check +++ /dev/null @@ -1,8 +0,0 @@ - -val case = 9 - ^ -repl-paste-parse.script:1: error: illegal start of simple pattern - -scala> - -scala> :quit diff --git a/test/files/run/repl-paste-parse.scala b/test/files/run/repl-paste-parse.scala deleted file mode 100644 index 9f10c9abe68b..000000000000 --- a/test/files/run/repl-paste-parse.scala +++ /dev/null @@ -1,19 +0,0 @@ -import scala.tools.partest.ReplTest -import scala.tools.nsc.Settings -import scala.tools.nsc.GenericRunnerSettings -import scala.tools.nsc.settings.MutableSettings - -object Test extends ReplTest { - def scriptPath = testPath.changeExtension("script") - override def transformSettings(s: Settings) = s match { - case m: MutableSettings => - val t = new GenericRunnerSettings(s.errorFn) - m copyInto t - t processArgumentString s"-usejavacp -i $scriptPath" - t - case _ => s - } - - def code = "" -} - diff --git a/test/files/run/repl-paste-parse.script b/test/files/run/repl-paste-parse.script deleted file mode 100644 index 903f6e7b0c07..000000000000 --- a/test/files/run/repl-paste-parse.script +++ /dev/null @@ -1 +0,0 @@ -val case = 9 diff --git a/test/files/run/t7805-repl-i.check b/test/files/run/t7805-repl-i.check deleted file mode 100644 index b4485715de33..000000000000 --- a/test/files/run/t7805-repl-i.check +++ /dev/null @@ -1,5 +0,0 @@ - -scala> Console println Try(8) -Success(8) - -scala> :quit diff --git a/test/files/run/t7805-repl-i.scala b/test/files/run/t7805-repl-i.scala deleted file mode 100644 index 816926b7c38a..000000000000 --- a/test/files/run/t7805-repl-i.scala +++ /dev/null @@ -1,43 +0,0 @@ -// java: -Dneeds.forked.jvm - -import scala.tools.partest.ReplTest -import scala.tools.nsc.{ GenericRunnerSettings, Settings } -import scala.tools.nsc.settings.MutableSettings - -object Test extends ReplTest with HangingRepl { - def script = testPath changeExtension "script" - override def transformSettings(s: Settings) = s match { - case m: MutableSettings => - val t = new GenericRunnerSettings(s.errorFn) - m copyInto t - t processArgumentString s"-i $script" - t - case _ => s - } - def code = "Console println Try(8)" -} - -object Resulting { - import scala.concurrent._ - import scala.concurrent.duration._ - implicit class AwaitResult[A](val f: Future[A]) extends AnyVal { - def resultWithin(d: Duration): A = Await.result(f, d) - } -} - -/** Test that hangs the REPL. - * Usually that is the "before" case. - */ -trait HangingRepl extends ReplTest { - import scala.language.postfixOps - import scala.util._ - import scala.concurrent._ - import scala.concurrent.duration._ - import ExecutionContext.Implicits._ - import Resulting._ - def timeout = 120 seconds - def hanging[A](a: => A): A = Future(a) resultWithin timeout - override def show() = Try(hanging(super.show())) recover { - case e => e.printStackTrace() - } -} diff --git a/test/files/run/t7805-repl-i.script b/test/files/run/t7805-repl-i.script deleted file mode 100644 index eb2b8705f362..000000000000 --- a/test/files/run/t7805-repl-i.script +++ /dev/null @@ -1 +0,0 @@ -import util._ diff --git a/test/files/run/t9102.scala b/test/files/run/t9102.scala index c46cf0e4b42a..b7f55d095c98 100644 --- a/test/files/run/t9102.scala +++ b/test/files/run/t9102.scala @@ -29,43 +29,6 @@ object Test extends App { } } -/* Session tests without special init code should reside in simple script files. - * Also, provide filters such as for `(bound to C@74f7d1d2)`. - -import scala.tools.partest.SessionTest - -object Test extends SessionTest { -//Welcome to Scala version 2.11.6 (Java HotSpot(TM) 64-Bit Server VM, Java 1.8.0_40). - def session = - s"""|Type in expressions to have them evaluated. - |Type :help for more information. - | - |scala> import reflect.runtime._, universe._ - |import reflect.runtime._ - |import universe._ - | - |scala> class C { def f(i: Int, j: => Int) = i + j } - |defined class C - | - |scala> typeOf[C].member(TermName("f")) - |res0: reflect.runtime.universe.Symbol = method f - | - |scala> .asMethod - |res1: reflect.runtime.universe.MethodSymbol = method f - | - |scala> currentMirror reflect (new C) - |res2: reflect.runtime.universe.InstanceMirror = instance mirror for C@74f7d1d2 - | - |scala> res2 reflectMethod res1 - |res3: reflect.runtime.universe.MethodMirror = method mirror for def f(i: scala.Int,j: => scala.Int): scala.Int (bound to C@74f7d1d2) - | - |scala> res3(2,3) - |res4: Any = 5 - | - |scala> :quit""" -} -*/ - /* was: scala> res3(2,3) java.lang.IllegalArgumentException @@ -78,4 +41,3 @@ java.lang.IllegalArgumentException at scala.reflect.runtime.JavaMirrors$JavaMirror$JavaTransformingMethodMirror.apply(JavaMirrors.scala:436) ... 33 elided */ -