Generalize test infrastructure

Compiler tests can now be run with configurable number of compilers and runs in a compiler.

1 files changed, 6 insertions, 7 deletions

diff --git a/test/test/CompilerTest.scala b/test/test/CompilerTest.scala
index 09112be2f..26a0b3831 100644
--- a/test/test/CompilerTest.scala
+++ b/test/test/CompilerTest.scala
@@ -10,13 +10,12 @@ class CompilerTest extends DottyTest {
 
   def defaultOptions: List[String] = Nil
 
-  def compileArgs(args: Array[String], xerrors: Int = 0): Unit =
-    if (args.exists(_.startsWith("#")))
-      Bench.main(args ++ defaultOptions)
-    else {
-      val nerrors = Main.process(args ++ defaultOptions).count(Reporter.ERROR.level)
-      assert(nerrors == xerrors, s"Wrong # of errors. Expected: $xerrors, found: $nerrors")
-    }
+  def compileArgs(args: Array[String], xerrors: Int = 0): Unit = {
+    val allArgs = args ++ defaultOptions
+    val processor = if (allArgs.exists(_.startsWith("#"))) Bench else Main
+    val nerrors = processor.process(allArgs).count(Reporter.ERROR.level)
+    assert(nerrors == xerrors, s"Wrong # of errors. Expected: $xerrors, found: $nerrors")
+  }
 
   def compileLine(cmdLine: String, xerrors: Int = 0): Unit = compileArgs(cmdLine.split("\n"), xerrors)