Share process pool for a test suite and clean up properly

Author: liufengyun

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -16,21 +16,12 @@ import scala.concurrent.duration._
 import TestSources.sources
 import vulpix._
 
-class CompilationTests extends ParallelTesting {
+class CompilationTests {
   import ParallelTesting._
   import TestConfiguration._
   import CompilationTests._
   import CompilationTest.aggregateTests
 
-  // Test suite configuration --------------------------------------------------
-
-  def maxDuration = 45.seconds
-  def numberOfSlaves = 5
-  def safeMode = Properties.testsSafeMode
-  def isInteractive = SummaryReport.isInteractive
-  def testFilter = Properties.testsFilter
-  def updateCheckFiles: Boolean = Properties.testsUpdateCheckfile
-
   // Positive tests ------------------------------------------------------------
 
   @Test def pos: Unit = {
@@ -333,7 +324,19 @@ class CompilationTests extends ParallelTesting {
 
 }
 
-object CompilationTests {
+object CompilationTests extends ParallelTesting {
+  // Test suite configuration --------------------------------------------------
+
+  def maxDuration = 45.seconds
+  def numberOfSlaves = 5
+  def safeMode = Properties.testsSafeMode
+  def isInteractive = SummaryReport.isInteractive
+  def testFilter = Properties.testsFilter
+  def updateCheckFiles: Boolean = Properties.testsUpdateCheckfile
+
   implicit val summaryReport: SummaryReporting = new SummaryReport
-  @AfterClass def cleanup(): Unit = summaryReport.echoSummary()
+  @AfterClass def tearDown(): Unit = {
+    super.cleanup()
+    summaryReport.echoSummary()
+  }
 }

compiler/test/dotty/tools/dotc/FromTastyTests.scala

@@ -9,19 +9,10 @@ import java.io.{File => JFile}
 
 import scala.concurrent.duration._
 
-class FromTastyTests extends ParallelTesting {
+class FromTastyTests {
   import TestConfiguration._
   import FromTastyTests._
 
-  // Test suite configuration --------------------------------------------------
-
-  def maxDuration = 30.seconds
-  def numberOfSlaves = 5
-  def safeMode = Properties.testsSafeMode
-  def isInteractive = SummaryReport.isInteractive
-  def testFilter = Properties.testsFilter
-  def updateCheckFiles: Boolean = Properties.testsUpdateCheckfile
-
   @Test def posTestFromTasty: Unit = {
     // Can be reproduced with
     // > sbt
@@ -46,7 +37,19 @@ class FromTastyTests extends ParallelTesting {
   }
 }
 
-object FromTastyTests {
+object FromTastyTests extends ParallelTesting {
+  // Test suite configuration --------------------------------------------------
+
+  def maxDuration = 30.seconds
+  def numberOfSlaves = 5
+  def safeMode = Properties.testsSafeMode
+  def isInteractive = SummaryReport.isInteractive
+  def testFilter = Properties.testsFilter
+  def updateCheckFiles: Boolean = Properties.testsUpdateCheckfile
+
   implicit val summaryReport: SummaryReporting = new SummaryReport
-  @AfterClass def cleanup(): Unit = summaryReport.echoSummary()
+  @AfterClass def tearDown(): Unit = {
+    super.cleanup()
+    summaryReport.echoSummary()
+  }
 }

compiler/test/dotty/tools/dotc/IdempotencyTests.scala

@@ -13,20 +13,11 @@ import scala.concurrent.duration._
 import vulpix._
 
 
-class IdempotencyTests extends ParallelTesting {
+class IdempotencyTests {
   import TestConfiguration._
   import IdempotencyTests._
   import CompilationTest.aggregateTests
 
-  // Test suite configuration --------------------------------------------------
-
-  def maxDuration = 30.seconds
-  def numberOfSlaves = 5
-  def safeMode = Properties.testsSafeMode
-  def isInteractive = SummaryReport.isInteractive
-  def testFilter = Properties.testsFilter
-  def updateCheckFiles: Boolean = Properties.testsUpdateCheckfile
-
   @Category(Array(classOf[SlowTests]))
   @Test def idempotency: Unit = {
     implicit val testGroup: TestGroup = TestGroup("idempotency")
@@ -71,7 +62,19 @@ class IdempotencyTests extends ParallelTesting {
 
 }
 
-object IdempotencyTests {
+object IdempotencyTests extends ParallelTesting {
+  // Test suite configuration --------------------------------------------------
+
+  def maxDuration = 30.seconds
+  def numberOfSlaves = 5
+  def safeMode = Properties.testsSafeMode
+  def isInteractive = SummaryReport.isInteractive
+  def testFilter = Properties.testsFilter
+  def updateCheckFiles: Boolean = Properties.testsUpdateCheckfile
+
   implicit val summaryReport: SummaryReporting = new SummaryReport
-  @AfterClass def cleanup(): Unit = summaryReport.echoSummary()
+  @AfterClass def tearDown(): Unit = {
+    super.cleanup()
+    summaryReport.echoSummary()
+  }
 }

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

@@ -49,6 +49,9 @@ trait RunnerOrchestration {
   def runMain(classPath: String)(implicit summaryReport: SummaryReporting): Status =
     monitor.runMain(classPath)
 
+  /** Kill all processes */
+  def cleanup() = monitor.killAll()
+
   private val monitor = new RunnerMonitor
 
   /** The runner monitor object keeps track of child JVM processes by keeping
@@ -195,9 +198,10 @@ trait RunnerOrchestration {
       result
     }
 
-    private def killAll(): Unit =
+    def killAll(): Unit = {
       freeRunners.foreach(_.kill())
       busyRunners.foreach(_.kill())
+    }
 
     // On shutdown, we need to kill all runners:
     sys.addShutdownHook(killAll())

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

@@ -1,7 +1,7 @@
 package dotty.tools
 package vulpix
 
-import org.junit.Test
+import org.junit.{ Test, AfterClass }
 import org.junit.experimental.categories.Category
 import scala.concurrent.duration._
 import TestConfiguration._
@@ -11,14 +11,8 @@ import TestConfiguration._
  *  output against an expected result.
  */
 @Category(Array(classOf[dotty.VulpixMetaTests]))
-class VulpixMetaTests extends ParallelTesting {
-  def maxDuration = 1.seconds
-  // Ensure maximum reproducibility.
-  def numberOfSlaves = 1
-  def safeMode = false // Don't fork a new VM after each run test
-  def isInteractive = false // Don't beautify output for interactive use.
-  def testFilter = None // Run all the tests.
-  def updateCheckFiles: Boolean = false
+class VulpixMetaTests {
+  import VulpixMetaTests._
 
   implicit val summaryReport: SummaryReporting = new SummaryReport
   implicit def testGroup: TestGroup = TestGroup("VulpixMetaTests")
@@ -27,3 +21,16 @@ class VulpixMetaTests extends ParallelTesting {
   @Test def compileNeg: Unit = compileFilesInDir("tests/vulpix-tests/meta/neg", defaultOptions).checkExpectedErrors()
   @Test def runAll: Unit     = compileFilesInDir("tests/vulpix-tests/meta/run", defaultOptions).checkRuns()
 }
+
+object VulpixMetaTests extends ParallelTesting {
+  def maxDuration = 1.seconds
+  // Ensure maximum reproducibility.
+  def numberOfSlaves = 1
+  def safeMode = false // Don't fork a new VM after each run test
+  def isInteractive = false // Don't beautify output for interactive use.
+  def testFilter = None // Run all the tests.
+  def updateCheckFiles: Boolean = false
+
+  @AfterClass
+  def tearDown() = this.cleanup()
+}

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

@@ -3,26 +3,20 @@ package vulpix
 
 import java.io.{File => JFile}
 import org.junit.Assert._
-import org.junit.Test
+import org.junit.{ Test, AfterClass }
 
 import scala.concurrent.duration._
 import scala.util.control.NonFatal
 
 /** Unit tests for the Vulpix test suite */
-class VulpixUnitTests extends ParallelTesting {
+class VulpixUnitTests {
+  import VulpixUnitTests._
   import TestConfiguration._
 
   implicit val _: SummaryReporting = new NoSummaryReport
 
   implicit def testGroup: TestGroup = TestGroup("VulpixTests")
 
-  def maxDuration = 3.seconds
-  def numberOfSlaves = 5
-  def safeMode = sys.env.get("SAFEMODE").isDefined
-  def isInteractive = !sys.env.contains("DRONE")
-  def testFilter = None
-  def updateCheckFiles: Boolean = false
-
   // To fail with something else than an AssertionError
   def fail(): Unit = throw new Exception("didn't fail properly")
 
@@ -103,3 +97,16 @@ class VulpixUnitTests extends ParallelTesting {
     }
   }
 }
+
+
+object VulpixUnitTests extends ParallelTesting {
+  def maxDuration = 3.seconds
+  def numberOfSlaves = 5
+  def safeMode = sys.env.get("SAFEMODE").isDefined
+  def isInteractive = !sys.env.contains("DRONE")
+  def testFilter = None
+  def updateCheckFiles: Boolean = false
+
+  @AfterClass
+  def tearDown() = this.cleanup()
+}