From c9e1bc5b6324d2a896d731eeec32bdd941d1629b Mon Sep 17 00:00:00 2001
From: Felix Mulder <felix.mulder@gmail.com>
Date: Thu, 13 Apr 2017 09:41:12 +0200
Subject: Fix #2243: improve failing test output

---
 compiler/test/dotty/tools/dotc/CompilationTests.scala  | 4 ++--
 compiler/test/dotty/tools/vulpix/ParallelTesting.scala | 8 +++++---
 compiler/test/dotty/tools/vulpix/SummaryReport.scala   | 2 +-
 3 files changed, 8 insertions(+), 6 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/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
index f43462011..1315da3a4 100644
--- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
+++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
@@ -265,7 +265,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
     private[this] val failedTestSources = mutable.ArrayBuffer.empty[String]
     protected final def failTestSource(testSource: TestSource, reason: Option[String] = None) = synchronized {
       val extra = reason.map(" with reason: " + _).getOrElse("")
-      failedTestSources.append(testSource.title + s" failed (in ${testSource.name})" + extra)
+      failedTestSources.append(testSource.title + s" failed" + extra)
       fail()
     }
 
@@ -519,6 +519,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
         }
 
         case Failure(output) =>
+          echo(s"Test '${testSource.title}' failed with output:")
           echo(output)
           failTestSource(testSource)
 
@@ -1018,6 +1019,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
       .getOrElse {
         throw new IllegalStateException("Unable to reflectively find calling method")
       }
+      .takeWhile(_ != '$')
   }
 
   /** Compiles a single file from the string path `f` using the supplied flags */
@@ -1072,7 +1074,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
     val targetDir = new JFile(outDir + "/" + sourceDir.getName + "/")
     targetDir.mkdirs()
 
-    val target = JointCompilationSource(callingMethod, randomized, flags, targetDir)
+    val target = JointCompilationSource(s"compiling '$f' in test '$callingMethod'", randomized, flags, targetDir)
     new CompilationTest(target)
   }
 
@@ -1089,7 +1091,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
     targetDir.mkdirs()
     assert(targetDir.exists, s"couldn't create target directory: $targetDir")
 
-    val target = JointCompilationSource(callingMethod, files.map(new JFile(_)).toArray, flags, targetDir)
+    val target = JointCompilationSource(s"$testName from $callingMethod", files.map(new JFile(_)).toArray, flags, targetDir)
 
     // Create a CompilationTest and let the user decide whether to execute a pos or a neg test
     new CompilationTest(target)
diff --git a/compiler/test/dotty/tools/vulpix/SummaryReport.scala b/compiler/test/dotty/tools/vulpix/SummaryReport.scala
index 8f3047f49..efca94bba 100644
--- a/compiler/test/dotty/tools/vulpix/SummaryReport.scala
+++ b/compiler/test/dotty/tools/vulpix/SummaryReport.scala
@@ -95,7 +95,7 @@ final class SummaryReport extends SummaryReporting {
 
     startingMessages.foreach(rep.append)
 
-    failedTests.map(x => "    " + x).foreach(rep.append)
+    failedTests.map(x => s"    $x\n").foreach(rep.append)
 
     // If we're compiling locally, we don't need instructions on how to
     // reproduce failures
-- 
cgit v1.2.3