@@ -236,17 +236,14 @@ abstract class CompilerTest {
236
236
val processor = if (allArgs.exists(_.startsWith(" #" ))) Bench else Main
237
237
val storeReporter = new Reporter with UniqueMessagePositions with HideNonSensicalMessages {
238
238
private val consoleReporter = new ConsoleReporter ()
239
- private var innerStoreReporter = new StoreReporter (consoleReporter)
239
+ private val innerStoreReporter = new StoreReporter (consoleReporter)
240
240
def doReport (d : Diagnostic )(implicit ctx : Context ): Unit = {
241
- if (innerStoreReporter == null ) {
242
- consoleReporter.report(d)
243
- } else {
244
- innerStoreReporter.report(d)
245
- if (d.level == ERROR ) {
246
- innerStoreReporter.flush()
247
- innerStoreReporter = null
248
- }
241
+ if (d.level == ERROR ) {
242
+ innerStoreReporter.flush()
243
+ consoleReporter.doReport(d)
249
244
}
245
+ else if (errorCount > 0 ) consoleReporter.doReport(d)
246
+ else innerStoreReporter.doReport(d)
250
247
}
251
248
}
252
249
val reporter = processor.process(allArgs, storeReporter)
@@ -260,6 +257,7 @@ abstract class CompilerTest {
260
257
assert(nerrors == xerrors,
261
258
s """ Wrong # of errors. Expected: $xerrors, found: $nerrors
262
259
|Files with expected errors: $expectedErrorFiles
260
+ |errors:
263
261
""" .stripMargin)
264
262
// NEG TEST
265
263
if (xerrors > 0 ) {
0 commit comments