Skip to content

Commit 8086091

Browse files
committed
Add the scalajs-ir jar to the classpath in tests.
1 parent 46180f1 commit 8086091

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
@@ -210,7 +210,8 @@ class CompilationTests extends ParallelTesting {
210210
defaultOutputDir + dotty1Group + "/dotty/" + sep +
211211
// and the other compiler dependenies:
212212
Properties.compilerInterface + sep + Properties.scalaLibrary + sep + Properties.scalaAsm + sep +
213-
Properties.dottyInterfaces + sep + Properties.jlineTerminal + sep + Properties.jlineReader,
213+
Properties.dottyInterfaces + sep + Properties.jlineTerminal + sep + Properties.jlineReader + sep +
214+
Properties.scalaJSIR,
214215
Array("-Ycheck-reentrant", "-Yemit-tasty-in-class")
215216
)
216217

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
@@ -595,7 +595,8 @@ object Build {
595595
"-Ddotty.tests.classes.scalaAsm=" + findLib(attList, "scala-asm"),
596596
"-Ddotty.tests.classes.scalaXml=" + findLib(attList, "scala-xml"),
597597
"-Ddotty.tests.classes.jlineTerminal=" + findLib(attList, "jline-terminal"),
598-
"-Ddotty.tests.classes.jlineReader=" + findLib(attList, "jline-reader")
598+
"-Ddotty.tests.classes.jlineReader=" + findLib(attList, "jline-reader"),
599+
"-Ddotty.tests.classes.scalaJSIR=" + findLib(attList, "scalajs-ir")
599600
)
600601

601602
jarOpts ::: tuning ::: agentOptions ::: ci_build

0 commit comments

Comments
 (0)