@@ -244,7 +244,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
244
244
245
245
final def countErrors (reporters : Seq [TestReporter ]) = countErrorsAndWarnings(reporters)._1
246
246
final def countWarnings (reporters : Seq [TestReporter ]) = countErrorsAndWarnings(reporters)._2
247
- final def reporterFailed (r : TestReporter ) = r.compilerCrashed || r. errorCount > 0
247
+ final def reporterFailed (r : TestReporter ) = r.errorCount > 0
248
248
249
249
/**
250
250
* For a given test source, returns a check file against which the result of the test run
@@ -737,8 +737,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
737
737
def showDiagnostics = " -> following the diagnostics:\n " +
738
738
reporters.flatMap(_.diagnostics.toSeq.sortBy(_.pos.line).map(e => s " ${e.pos.line + 1 }: ${e.message}" )).mkString(" at " , " \n at " , " " )
739
739
Option :
740
- if reporters.exists(_.compilerCrashed) then s " Compiler crashed when compiling: ${testSource.title}"
741
- else if reporters.exists(_.errorCount > 0 ) then
740
+ if reporters.exists(_.errorCount > 0 ) then
742
741
s """ Compilation failed for: ${testSource.title}
743
742
| $showDiagnostics
744
743
| """ .stripMargin.trim.linesIterator.mkString(" \n " , " \n " , " " )
@@ -862,7 +861,6 @@ trait ParallelTesting extends RunnerOrchestration { self =>
862
861
override def suppressErrors = true
863
862
864
863
override def maybeFailureMessage (testSource : TestSource , reporters : Seq [TestReporter ]): Option [String ] =
865
- def compilerCrashed = reporters.exists(_.compilerCrashed)
866
864
lazy val (errorMap, expectedErrors) = getErrorMapAndExpectedCount(testSource.sourceFiles.toIndexedSeq)
867
865
lazy val actualErrors = reporters.foldLeft(0 )(_ + _.errorCount)
868
866
lazy val (expected, unexpected) = getMissingExpectedErrors(errorMap, reporters.iterator.flatMap(_.errors))
@@ -871,8 +869,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
871
869
reporters.flatMap(_.allErrors.sortBy(_.pos.line).map(e => s " ${e.pos.line + 1 }: ${e.message}" )).mkString(" at " , " \n at " , " " )
872
870
873
871
Option {
874
- if compilerCrashed then s " Compiler crashed when compiling: ${testSource.title}"
875
- else if actualErrors == 0 then s " \n No errors found when compiling neg test $testSource"
872
+ if actualErrors == 0 then s " \n No errors found when compiling neg test $testSource"
876
873
else if expectedErrors == 0 then s " \n No errors expected/defined in $testSource -- use // error or // nopos-error "
877
874
else if expectedErrors != actualErrors then
878
875
s """ |Wrong number of errors encountered when compiling $testSource
0 commit comments