Skip to content

Commit f247799

Browse files
committed
Fix tests: add jline to test classpath
1 parent d9c0c54 commit f247799

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

compiler/src/dotty/tools/dotc/reporting/Reporter.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ object Reporter {
2525
}
2626

2727
/** A reporter that ignores reports */
28-
object NoReporter extends Reporter {
28+
@sharable object NoReporter extends Reporter {
2929
def doReport(m: MessageContainer)(implicit ctx: Context) = ()
3030
override def report(m: MessageContainer)(implicit ctx: Context): Unit = ()
3131
}

compiler/test/dotty/Jars.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@ object Jars {
1818
lazy val scalaAsm: String =
1919
findJarFromRuntime("scala-asm-6.0.0-scala-1")
2020

21+
/** JLine Jar */
22+
lazy val jline: String =
23+
findJarFromRuntime("jline-3.7.0")
24+
2125
/** Dotty extras classpath from env or properties */
2226
val dottyExtras: List[String] = sys.env.get("DOTTY_EXTRAS")
2327
.map(_.split(":").toList).getOrElse(Properties.dottyExtras)
2428

25-
/** Dotty REPL dependencies */
26-
val dottyReplDeps: List[String] = dottyLib :: dottyExtras
27-
2829
/** Dotty test dependencies */
2930
val dottyTestDeps: List[String] =
30-
dottyLib :: dottyCompiler :: dottyInterfaces :: dottyExtras
31+
dottyLib :: dottyCompiler :: dottyInterfaces :: jline :: dottyExtras
3132

3233
/** Dotty runtime with compiler dependencies, used for quoted.Expr.run */
3334
lazy val dottyRunWithCompiler: List[String] =

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,8 @@ class CompilationTests extends ParallelTesting {
255255
defaultOutputDir + libGroup + "/src/:" +
256256
// as well as bootstrapped compiler:
257257
defaultOutputDir + dotty1Group + "/dotty/:" +
258-
Jars.dottyInterfaces,
258+
// and the other compiler dependecies:
259+
Jars.dottyInterfaces + ":" + Jars.jline,
259260
Array("-Ycheck-reentrant")
260261
)
261262

0 commit comments

Comments
 (0)