SI-7805 REPL -i startup

Tested with a ReplTest that loads an include script.

ReplTests can choose to be `Welcoming` and keep a
normalized welcome message in their check transcript.

One recent SessionTest is updated to use the normalizing API.

1 files changed, 6 insertions, 5 deletions

diff --git a/test/files/run/repl-trim-stack-trace.scala b/test/files/run/repl-trim-stack-trace.scala
index 0f4a43bc85..70ee8e1840 100644
--- a/test/files/run/repl-trim-stack-trace.scala
+++ b/test/files/run/repl-trim-stack-trace.scala
@@ -1,10 +1,11 @@
 
-import scala.tools.partest.SessionTest
+import scala.tools.partest.{ SessionTest, Welcoming }
 
 // SI-7740
-object Test extends SessionTest {
+object Test extends SessionTest with Welcoming {
   def session =
-"""Type in expressions to have them evaluated.
+"""Welcome to Scala
+Type in expressions to have them evaluated.
 Type :help for more information.
 
 scala> def f = throw new Exception("Uh-oh")
@@ -35,10 +36,10 @@ scala> """
 
   // normalize the "elided" lines because the frame count depends on test context
   lazy val elided = """(\s+\.{3} )\d+( elided)""".r
-  def normalize(line: String) = line match {
+  override def normalize(line: String) = line match {
+    case welcome(w)               => w
     case elided(ellipsis, suffix) => s"$ellipsis???$suffix"
     case s                        => s
   }
-  override def eval()   = super.eval() map normalize
   override def expected = super.expected map normalize
 }