summaryrefslogtreecommitdiff
path: root/test/files/run/t7747-repl.scala
diff options
context:
space:
mode:
authorStefan Zeiger <szeiger@novocode.com>2016-07-11 15:55:19 +0200
committerStefan Zeiger <szeiger@novocode.com>2016-07-15 19:23:30 +0200
commit36e2ae2fbd3d3637f2be6453e67778b706e1baa9 (patch)
tree26a5b5d223696e4a019c2464c364b085a73be8ef /test/files/run/t7747-repl.scala
parent3c43a7bc389eba0d7d52ef0d0cdb19812c4a8a0f (diff)
downloadscala-36e2ae2fbd3d3637f2be6453e67778b706e1baa9.tar.gz
scala-36e2ae2fbd3d3637f2be6453e67778b706e1baa9.tar.bz2
scala-36e2ae2fbd3d3637f2be6453e67778b706e1baa9.zip
Switch the bootstrap build over to sbt
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`
Diffstat (limited to 'test/files/run/t7747-repl.scala')
-rw-r--r--test/files/run/t7747-repl.scala8
1 files changed, 6 insertions, 2 deletions
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