Put related tests in same top level output directory

Author: nicolasstucki

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

@@ -240,10 +240,10 @@ class CompilationTests extends ParallelTesting {
    *  version of Dotty
    */
   @Test def tastyBootstrap: Unit = {
-    implicit val testGroup: TestGroup = TestGroup("tastyBootstrap")
-    val dotty1Group = TestGroup("dotty1")
-    val dotty2Group = TestGroup("dotty2")
-    val libGroup = TestGroup("lib")
+    implicit val testGroup: TestGroup = TestGroup("tastyBootstrap/tests")
+    val dotty1Group = TestGroup("tastyBootstrap/dotty1")
+    val dotty2Group = TestGroup("tastyBootstrap/dotty2")
+    val libGroup = TestGroup("tastyBootstrap/lib")
 
     val opt = TestFlags(
       // compile with bootstrapped library on cp:

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

@@ -37,17 +37,17 @@ class IdempotencyTests extends ParallelTesting {
     val strawmanSourcesRevSorted = strawmanSourcesSorted.reverse
 
     val posIdempotency = {
-      compileFilesInDir("../tests/pos", opt)(TestGroup("posIdempotency1")) +
-      compileFilesInDir("../tests/pos", opt)(TestGroup("posIdempotency2"))
+      compileFilesInDir("../tests/pos", opt)(TestGroup("idempotency/posIdempotency1")) +
+      compileFilesInDir("../tests/pos", opt)(TestGroup("idempotency/posIdempotency2"))
     }
 
     val orderIdempotency = {
       (for {
         testDir <- new JFile("../tests/order-idempotency").listFiles() if testDir.isDirectory
       } yield {
         val sources = sourcesFrom(testDir.toPath)
-        compileList(testDir.getName, sources, opt)(TestGroup("orderIdempotency1")) +
-        compileList(testDir.getName, sources.reverse, opt)(TestGroup("orderIdempotency2"))
+        compileList(testDir.getName, sources, opt)(TestGroup("idempotency/orderIdempotency1")) +
+        compileList(testDir.getName, sources.reverse, opt)(TestGroup("idempotency/orderIdempotency2"))
       }).reduce(_ + _)
     }
 
@@ -60,7 +60,7 @@ class IdempotencyTests extends ParallelTesting {
 
     def check(name: String) = {
       val files = List(s"../tests/idempotency/$name.scala", "../tests/idempotency/IdempotencyCheck.scala")
-      compileList(name, files, defaultOptions)(TestGroup("check"))
+      compileList(name, files, defaultOptions)(TestGroup("idempotency/check"))
     }
     val allChecks = {
       check("CheckOrderIdempotency") +

compiler/test/dotty/tools/dotc/LinkOptimiseTests.scala renamed to compiler/test/dotty/tools/dotc/LinkTests.scala

@@ -12,10 +12,10 @@ import vulpix._
 import scala.concurrent.duration._
 import scala.collection.JavaConverters._
 
-class LinkOptimiseTests extends ParallelTesting {
+class LinkTests extends ParallelTesting {
   import ParallelTesting._
   import TestConfiguration._
-  import LinkOptimiseTests._
+  import LinkTests._
 
   // Test suite configuration --------------------------------------------------
 
@@ -26,12 +26,12 @@ class LinkOptimiseTests extends ParallelTesting {
   def testFilter = Properties.testsFilter
 
 
-  @Test def linkOptimise: Unit = {
+  @Test def linkTest: Unit = {
     // Setup and compile libraries
-    val strawmanLibGroup = TestGroup("strawmanLibrary")
+    val strawmanLibGroup = TestGroup("linkTest/strawmanLibrary")
     val strawmanLibTestGroup = TestGroup(strawmanLibGroup + "/tests")
 
-    val linkCustomLibGroup = TestGroup("linkCustomLib")
+    val linkCustomLibGroup = TestGroup("linkTest/linkCustomLib")
     val linkCustomLibTestGroup = TestGroup(linkCustomLibGroup + "/tests")
 
     val strawmanLibrary = compileDir("../collection-strawman/collections/src/main", defaultOptions)(strawmanLibGroup)
@@ -87,7 +87,7 @@ class LinkOptimiseTests extends ParallelTesting {
 
 }
 
-object LinkOptimiseTests {
+object LinkTests {
   implicit val summaryReport: SummaryReporting = new SummaryReport
   @AfterClass def cleanup(): Unit = summaryReport.echoSummary()
 }

tests/idempotency/BootstrapChecker.scala

@@ -1,5 +1,5 @@
 
 object Test {
   def main(args: Array[String]): Unit =
-    IdempotencyCheck.checkIdempotency("../out/dotty1", "../out/dotty2")
+    IdempotencyCheck.checkIdempotency("../out/tastyBootstrap/dotty1", "../out/tastyBootstrap/dotty2")
 }

tests/idempotency/CheckOrderIdempotency.scala

@@ -1,5 +1,5 @@
 
 object Test {
   def main(args: Array[String]): Unit =
-    IdempotencyCheck.checkIdempotency("../out/orderIdempotency1", "../out/orderIdempotency2")
+    IdempotencyCheck.checkIdempotency("../out/idempotency/orderIdempotency1", "../out/idempotency/orderIdempotency2")
 }

tests/idempotency/CheckPosIdempotency.scala

@@ -1,5 +1,5 @@
 
 object Test {
   def main(args: Array[String]): Unit =
-    IdempotencyCheck.checkIdempotency("../out/posIdempotency1", "../out/posIdempotency2")
+    IdempotencyCheck.checkIdempotency("../out/idempotency/posIdempotency1", "../out/idempotency/posIdempotency2")
 }