diff options
| author | Martin Odersky <odersky@gmail.com> | 2016-11-23 18:55:14 +0100 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2016-11-24 09:44:20 +0100 |
| commit | 0d507d721529c596594ee6fe2de9ba7b7696eb27 (patch) | |
| tree | 0f5859b6263653622d927b9d505dda2911bb92e4 | |
| parent | 9c1cb55478c7ce5708a36b67b65d857d8f907bd3 (diff) | |
| download | dotty-0d507d721529c596594ee6fe2de9ba7b7696eb27.tar.gz dotty-0d507d721529c596594ee6fe2de9ba7b7696eb27.tar.bz2 dotty-0d507d721529c596594ee6fe2de9ba7b7696eb27.zip | |
make REPL tests look at DOTTY_EXTRA classpath entries
| -rw-r--r-- | compiler/test/dotty/Jars.scala | 4 | ||||
| -rw-r--r-- | compiler/test/dotty/tools/dotc/repl/TestREPL.scala | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/compiler/test/dotty/Jars.scala b/compiler/test/dotty/Jars.scala index 989726bd4..42c707069 100644 --- a/compiler/test/dotty/Jars.scala +++ b/compiler/test/dotty/Jars.scala @@ -15,7 +15,9 @@ object Jars { } val dottyExtras: List[String] = sys.env.get("DOTTY_EXTRAS") - .map(_.split(",").toList).getOrElse(Nil) + .map(_.split(":").toList).getOrElse(Nil) + + val dottyReplDeps: List[String] = dottyLib :: dottyExtras val dottyTestDeps: List[String] = dottyLib :: dottyCompiler :: dottyInterfaces :: dottyExtras diff --git a/compiler/test/dotty/tools/dotc/repl/TestREPL.scala b/compiler/test/dotty/tools/dotc/repl/TestREPL.scala index 70f701791..a38abcbab 100644 --- a/compiler/test/dotty/tools/dotc/repl/TestREPL.scala +++ b/compiler/test/dotty/tools/dotc/repl/TestREPL.scala @@ -24,7 +24,7 @@ class TestREPL(script: String) extends REPL { override def context(ctx: Context) = { val fresh = ctx.fresh fresh.setSetting(ctx.settings.color, "never") - fresh.setSetting(ctx.settings.classpath, Jars.dottyLib) + fresh.setSetting(ctx.settings.classpath, Jars.dottyReplDeps.mkString(":")) fresh.initialize()(fresh) fresh } |