Skip to content

Commit 0d507d7

Browse files
oderskyfelixmulder
authored andcommitted
make REPL tests look at DOTTY_EXTRA classpath entries
1 parent 9c1cb55 commit 0d507d7

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

compiler/test/dotty/Jars.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ object Jars {
1515
}
1616

1717
val dottyExtras: List[String] = sys.env.get("DOTTY_EXTRAS")
18-
.map(_.split(",").toList).getOrElse(Nil)
18+
.map(_.split(":").toList).getOrElse(Nil)
19+
20+
val dottyReplDeps: List[String] = dottyLib :: dottyExtras
1921

2022
val dottyTestDeps: List[String] =
2123
dottyLib :: dottyCompiler :: dottyInterfaces :: dottyExtras

compiler/test/dotty/tools/dotc/repl/TestREPL.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class TestREPL(script: String) extends REPL {
2424
override def context(ctx: Context) = {
2525
val fresh = ctx.fresh
2626
fresh.setSetting(ctx.settings.color, "never")
27-
fresh.setSetting(ctx.settings.classpath, Jars.dottyLib)
27+
fresh.setSetting(ctx.settings.classpath, Jars.dottyReplDeps.mkString(":"))
2828
fresh.initialize()(fresh)
2929
fresh
3030
}

0 commit comments

Comments
 (0)