When a test fails report number of _failures_ not _errors_ (V2)

Right now we report the number of "errors", that is compiler errors including
the expected ones, but we should instead use the test "failures", that is the
unexpected behaviors.

Also make errorCount private.

Author: Blaisorblade

compiler/test/dotty/tools/vulpix/ParallelTesting.scala

@@ -227,7 +227,8 @@ trait ParallelTesting extends RunnerOrchestration { self =>
     val sourceCount = filteredSources.length
 
     private[this] var _errorCount =  0
-    def errorCount: Int = _errorCount
+    /** Number of (expected or unexpected) compiler errors. Unlikely to be what you want, use `failureCount` instead. */
+    private[this] def errorCount: Int = _errorCount
 
     private[this] var _testSourcesCompleted = 0
     private def testSourcesCompleted: Int = _testSourcesCompleted
@@ -1012,11 +1013,11 @@ trait ParallelTesting extends RunnerOrchestration { self =>
 
     /** Extract `Failure` set and render from `Test` */
     private[this] def reasonsForFailure(test: Test): String = {
-      val errors =
-        if (test.errorCount == 0) ""
-        else s"\n  - encountered ${test.errorCount} error(s)"
+      val failureReport =
+        if (test.failureCount == 0) ""
+        else s"\n  - encountered ${test.failureCount} test failures(s)"
 
-      errors + test.failureReasons.collect {
+      failureReport + test.failureReasons.collect {
         case test.TimeoutFailure(title) =>
           s"  - test '$title' timed out"
         case test.JavaCompilationFailure(msg) =>

compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala

@@ -91,7 +91,7 @@ class VulpixUnitTests extends ParallelTesting {
       fail()
     } catch {
       case ae: AssertionError =>
-        assertEquals(ae.getMessage, "Run test failed, but should not, reasons:\n  - test 'tests/vulpix-tests/unit/timeout.scala' timed out")
+        assertEquals(ae.getMessage, "Run test failed, but should not, reasons:\n\n  - encountered 1 test failures(s)  - test 'tests/vulpix-tests/unit/timeout.scala' timed out")
     }
   }
 }