Fixing the test suite.

 - fix wrong directories
 - add xml where needed to teh classpath
 - reduce expected stub # because xml was added

1 files changed, 3 insertions, 3 deletions

diff --git a/src/dotty/tools/dotc/reporting/ConsoleReporter.scala b/src/dotty/tools/dotc/reporting/ConsoleReporter.scala
index 50bbdb671..c10fd91f9 100644
--- a/src/dotty/tools/dotc/reporting/ConsoleReporter.scala
+++ b/src/dotty/tools/dotc/reporting/ConsoleReporter.scala
@@ -28,10 +28,10 @@ class ConsoleReporter(
     if (pos.exists) { printMessage(" " * (pos.column - 1) + "^") }
 
   /** Prints the message. */
-  def printMessage(msg: String) { writer.print(msg + "\n"); writer.flush() }
+  def printMessage(msg: String): Unit = { writer.print(msg + "\n"); writer.flush() }
 
   /** Prints the message with the given position indication. */
-  def printMessageAndPos(msg: String, pos: SourcePosition)(implicit ctx: Context) {
+  def printMessageAndPos(msg: String, pos: SourcePosition)(implicit ctx: Context): Unit = {
     val posStr = if (pos.exists) s"$pos: " else ""
     printMessage(posStr + msg)
     if (pos.exists) {
@@ -61,5 +61,5 @@ class ConsoleReporter(
     }
   }
 
-  override def flush()(implicit ctx: Context) { writer.flush() }
+  override def flush()(implicit ctx: Context): Unit = { writer.flush() }
 }