Merge pull request #2248 from dotty-staging/topic/vulpix-fixes1

Various vulpix fixes

2 files changed, 25 insertions, 7 deletions

diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
index fa0c89f28..ff50d7238 100644
--- a/compiler/test/dotty/tools/dotc/CompilationTests.scala
+++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -216,9 +216,9 @@ class CompilationTests extends ParallelTesting {
     val opt = Array(
       "-classpath",
       // compile with bootstrapped library on cp:
-      defaultOutputDir + "lib$1/src/:" +
+      defaultOutputDir + "lib/src/:" +
       // as well as bootstrapped compiler:
-      defaultOutputDir + "dotty1$1/dotty/:" +
+      defaultOutputDir + "dotty1/dotty/:" +
       Jars.dottyInterfaces
     )
 
diff --git a/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala b/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala
index 7952ed728..213181b56 100644
--- a/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala
+++ b/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala
@@ -91,23 +91,41 @@ extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with M
 }
 
 object TestReporter {
-  val logWriter = {
+  private[this] var outFile: JFile = _
+  private[this] var logWriter: PrintWriter = _
+
+  private[this] def initLog() = if (logWriter eq null) {
     val df = new SimpleDateFormat("yyyy-MM-dd-HH:mm")
     val timestamp = df.format(new Date)
     new JFile("../testlogs").mkdirs()
-    new PrintWriter(new FileOutputStream(new JFile(s"../testlogs/tests-$timestamp.log"), true))
+    outFile = new JFile(s"../testlogs/tests-$timestamp.log")
+    logWriter = new PrintWriter(new FileOutputStream(outFile, true))
   }
 
-  def writeToLog(str: String) = {
+  def logPrintln(str: String) = {
+    initLog()
     logWriter.println(str)
     logWriter.flush()
   }
 
+  def logPrint(str: String): Unit = {
+    initLog()
+    logWriter.println(str)
+  }
+
+  def logFlush(): Unit =
+    if (logWriter ne null) logWriter.flush()
+
+  def logPath: String = {
+    initLog()
+    outFile.getCanonicalPath
+  }
+
   def reporter(ps: PrintStream, logLevel: Int): TestReporter =
-    new TestReporter(new PrintWriter(ps, true), writeToLog, logLevel)
+    new TestReporter(new PrintWriter(ps, true), logPrintln, logLevel)
 
   def simplifiedReporter(writer: PrintWriter): TestReporter = {
-    val rep = new TestReporter(writer, writeToLog, WARNING) {
+    val rep = new TestReporter(writer, logPrintln, WARNING) {
       /** Prints the message with the given position indication in a simplified manner */
       override def printMessageAndPos(m: MessageContainer, extra: String)(implicit ctx: Context): Unit = {
         def report() = {