From 36e2ae2fbd3d3637f2be6453e67778b706e1baa9 Mon Sep 17 00:00:00 2001
From: Stefan Zeiger <szeiger@novocode.com>
Date: Mon, 11 Jul 2016 15:55:19 +0200
Subject: Switch the bootstrap build over to sbt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

All of the individual ant builds that occured during `bootstrap` are
replaced by equivalent sbt builds.

- Allow extra dashes in version suffix when using SPLIT

- Clean up ScriptCommands

- Building an extra `locker` for stability testing with ant was not
  necessary but sbt also drops `strap`, so we need to build again
  with `quick` to get the equivalent of `strap`. The script for checking
  stability is invoked directly from the bootstrap script, not from sbt.

- `STARR` and `locker` build output is still logged to `logs/builds`,
  the main build runs log directly to the main console with colored
  output.

- Allow `—show-log` option on partest command line in sbt

- Normalize inferred LUB in `run/t7747-repl.scala`

- Add `normalize` feature from `ReplTest` to `InteractiveTest`

- Normalize inferred LUBs in `presentation/callcc-interpreter`
---
 test/files/presentation/callcc-interpreter/Runner.scala | 5 ++++-
 test/files/run/t7747-repl.scala                         | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'test/files')

diff --git a/test/files/presentation/callcc-interpreter/Runner.scala b/test/files/presentation/callcc-interpreter/Runner.scala
index 1ef3cf9025..a5698be5c2 100644
--- a/test/files/presentation/callcc-interpreter/Runner.scala
+++ b/test/files/presentation/callcc-interpreter/Runner.scala
@@ -1,3 +1,6 @@
 import scala.tools.nsc.interactive.tests._
 
-object Test extends InteractiveTest
\ No newline at end of file
+object Test extends InteractiveTest {
+  // Normalize ordering of LUB
+  override def normalize(s: String) = s.replace("Serializable with Product", "Product with Serializable")
+}
diff --git a/test/files/run/t7747-repl.scala b/test/files/run/t7747-repl.scala
index c6a7e419aa..0094d3ba98 100644
--- a/test/files/run/t7747-repl.scala
+++ b/test/files/run/t7747-repl.scala
@@ -8,8 +8,12 @@ object Test extends ReplTest {
     s
   }
 
-  // replace indylambda function names by <function0>
-  override def normalize(s: String) = """\$Lambda.*""".r.replaceAllIn(s, "<function0>")
+  override def normalize(s: String) = {
+    // replace indylambda function names by <function0>
+    val s2 = """\$Lambda.*""".r.replaceAllIn(s, "<function0>")
+    // Normalize ordering of LUB
+    s2.replace("Serializable with Product", "Product with Serializable")
+  }
 
   def code = """
     |var x = 10
-- 
cgit v1.2.3