Skip to content

Commit 00127ed

Browse files
committed
Add the scalajs-ir jar to the classpath in tests.
1 parent 718bea1 commit 00127ed

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

compiler/test/dotty/Properties.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,7 @@ object Properties {
5858

5959
/** jline-reader jar */
6060
def jlineReader: String = sys.props("dotty.tests.classes.jlineReader")
61+
62+
/** scalajs-ir jar */
63+
def scalaJSIR: String = sys.props("dotty.tests.classes.scalaJSIR")
6164
}

compiler/test/dotty/tools/dotc/CompilationTests.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,8 @@ class CompilationTests extends ParallelTesting {
216216
defaultOutputDir + dotty1Group + "/dotty/" + sep +
217217
// and the other compiler dependenies:
218218
Properties.compilerInterface + sep + Properties.scalaLibrary + sep + Properties.scalaAsm + sep +
219-
Properties.dottyInterfaces + sep + Properties.jlineTerminal + sep + Properties.jlineReader,
219+
Properties.dottyInterfaces + sep + Properties.jlineTerminal + sep + Properties.jlineReader + sep +
220+
Properties.scalaJSIR,
220221
Array("-Ycheck-reentrant", "-Yemit-tasty-in-class")
221222
)
222223

compiler/test/dotty/tools/vulpix/TestConfiguration.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ object TestConfiguration {
3131
Properties.scalaAsm,
3232
Properties.jlineTerminal,
3333
Properties.jlineReader,
34+
Properties.scalaJSIR,
3435
Properties.compilerInterface,
3536
Properties.dottyInterfaces,
3637
Properties.dottyLibrary,

project/Build.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,8 @@ object Build {
613613
"-Ddotty.tests.classes.scalaAsm=" + findLib(attList, "scala-asm"),
614614
"-Ddotty.tests.classes.scalaXml=" + findLib(attList, "scala-xml"),
615615
"-Ddotty.tests.classes.jlineTerminal=" + findLib(attList, "jline-terminal"),
616-
"-Ddotty.tests.classes.jlineReader=" + findLib(attList, "jline-reader")
616+
"-Ddotty.tests.classes.jlineReader=" + findLib(attList, "jline-reader"),
617+
"-Ddotty.tests.classes.scalaJSIR=" + findLib(attList, "scalajs-ir")
617618
)
618619

619620
jarOpts ::: tuning ::: agentOptions ::: ci_build

0 commit comments

Comments
 (0)