diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2016-07-18 14:36:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-18 14:36:50 -0700 |
| commit | ca57d028cebb8314aab63e3877751460231948f2 (patch) | |
| tree | 18bbfa00e49641afaabbc93a734625710cf8860f /test/files | |
| parent | 52fb8e88aa4ac5f1c165065e08c6bbe4d49eb4a9 (diff) | |
| parent | 36e2ae2fbd3d3637f2be6453e67778b706e1baa9 (diff) | |
| download | scala-ca57d028cebb8314aab63e3877751460231948f2.tar.gz scala-ca57d028cebb8314aab63e3877751460231948f2.tar.bz2 scala-ca57d028cebb8314aab63e3877751460231948f2.zip | |
Merge pull request #5285 from szeiger/wip/sbt-bootstrap
Switch the bootstrap build over to sbt
Diffstat (limited to 'test/files')
| -rw-r--r-- | test/files/presentation/callcc-interpreter/Runner.scala | 5 | ||||
| -rw-r--r-- | test/files/run/t7747-repl.scala | 8 |
2 files changed, 10 insertions, 3 deletions
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 |