Merge pull request #3019 from dotty-staging/add-compilation-order-idempotency-tests

nicolasstucki · web-flow · commit 5ca3224b19af · 2017-08-31T15:09:51.000+02:00
Add compilation order idempotency tests
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -236,13 +236,6 @@ class CompilationTests extends ParallelTesting {
       compileDir("../library/src",
         allowDeepSubtypes.and("-Ycheck-reentrant", "-strict", "-priorityclasspath", defaultOutputDir))
 
-    def sources(paths: JStream[Path], excludedFiles: List[String] = Nil): List[String] =
-      paths.iterator().asScala
-        .filter(path =>
-          (path.toString.endsWith(".scala") || path.toString.endsWith(".java"))
-            && !excludedFiles.contains(path.getFileName.toString))
-        .map(_.toString).toList
-
     val compilerDir = Paths.get("../compiler/src")
     val compilerSources = sources(Files.walk(compilerDir))
 
@@ -301,13 +294,6 @@ class CompilationTests extends ParallelTesting {
   }
 
   private val (compilerSources, backendSources, backendJvmSources) = {
-    def sources(paths: JStream[Path], excludedFiles: List[String] = Nil): List[String] =
-      paths.iterator().asScala
-        .filter(path =>
-          (path.toString.endsWith(".scala") || path.toString.endsWith(".java"))
-            && !excludedFiles.contains(path.getFileName.toString))
-        .map(_.toString).toList
-
     val compilerDir = Paths.get("../compiler/src")
     val compilerSources0 = sources(Files.walk(compilerDir))
 
@@ -332,4 +318,11 @@ class CompilationTests extends ParallelTesting {
 object CompilationTests {
   implicit val summaryReport: SummaryReporting = new SummaryReport
   @AfterClass def cleanup(): Unit = summaryReport.echoSummary()
+
+  def sources(paths: JStream[Path], excludedFiles: List[String] = Nil): List[String] =
+    paths.iterator().asScala
+      .filter(path =>
+        (path.toString.endsWith(".scala") || path.toString.endsWith(".java"))
+          && !excludedFiles.contains(path.getFileName.toString))
+      .map(_.toString).toList
 }
diff --git a/compiler/test/dotty/tools/dotc/IdempotencyTests.scala b/compiler/test/dotty/tools/dotc/IdempotencyTests.scala
@@ -2,6 +2,9 @@ package dotty
 package tools
 package dotc
 
+import java.io.{ File => JFile }
+import java.nio.file.{ Files, Paths, Path }
+
 import org.junit.{ Test, AfterClass }
 
 import scala.concurrent.duration._
@@ -22,25 +25,57 @@ class IdempotencyTests extends ParallelTesting {
   def testFilter = Properties.testsFilter
 
   /* TODO: Only run them selectively? */
-  @Test def bytecodeIdempotency: Unit = {
+  @Test def idempotency: Unit = {
     val opt = defaultOptions.and("-YemitTasty")
 
-    def idempotency1() = {
-      compileDir("../collection-strawman/src/main", opt) +
-      compileFilesInDir("../tests/pos", opt)
+    def sourcesFrom(dir: Path) = CompilationTests.sources(Files.walk(dir))
+
+    val strawmanSources = sourcesFrom(Paths.get("../collection-strawman/src/main"))
+    val strawmanSourcesSorted = strawmanSources.sorted
+    val strawmanSourcesRevSorted = strawmanSourcesSorted.reverse
+
+    val posIdempotency = {
+      def posIdempotency1 = compileFilesInDir("../tests/pos", opt)
+      def posIdempotency2 = compileFilesInDir("../tests/pos", opt)
+      posIdempotency1 + posIdempotency2
     }
-    def idempotency2() = {
-      compileDir("../collection-strawman/src/main", opt) +
-      compileFilesInDir("../tests/pos", opt)
+
+    val orderIdempotency = {
+      (for {
+        testDir <- new JFile("../tests/order-idempotency").listFiles() if testDir.isDirectory
+      } yield {
+        val sources = sourcesFrom(testDir.toPath)
+        def orderIdempotency1 = compileList(testDir.getName, sources, opt)
+        def orderIdempotency2 = compileList(testDir.getName, sources.reverse, opt)
+        orderIdempotency1 + orderIdempotency2
+      }).reduce(_ + _)
     }
 
-    val tests = (idempotency1() + idempotency2()).keepOutput.checkCompile()
+    val strawmanIdempotency = {
+      compileList("strawman0", strawmanSources, opt) +
+      compileList("strawman1", strawmanSources, opt) +
+      compileList("strawman2", strawmanSourcesSorted, opt) +
+      compileList("strawman3", strawmanSourcesRevSorted, opt)
+    }
 
-    assert(new java.io.File("../out/idempotency1/").exists)
-    assert(new java.io.File("../out/idempotency2/").exists)
+    def check(name: String) = {
+      val files = List(s"../tests/idempotency/$name.scala", "../tests/idempotency/IdempotencyCheck.scala")
+      compileList(name, files, defaultOptions)
+    }
+    val allChecks = {
+      check("CheckOrderIdempotency") +
+      check("CheckStrawmanIdempotency") +
+      check("CheckPosIdempotency")
+    }
 
-    compileList("idempotency", List("../tests/idempotency/Checker.scala", "../tests/idempotency/IdempotencyCheck.scala"), defaultOptions).checkRuns()
+    val allTests = {
+      strawmanIdempotency +
+      orderIdempotency +
+      posIdempotency
+    }
 
+    val tests = allTests.keepOutput.checkCompile()
+    allChecks.checkRuns()
     tests.delete()
   }
 
diff --git a/tests/idempotency/BootstrapChecker.scala b/tests/idempotency/BootstrapChecker.scala
@@ -1,5 +1,5 @@
 
 object Test {
   def main(args: Array[String]): Unit =
-    IdempotencyCheck.checkIdempotency("../out/dotty")
+    IdempotencyCheck.checkIdempotency("../out/dotty1", "../out/dotty2")
 }
diff --git a/tests/idempotency/CheckOrderIdempotency.scala b/tests/idempotency/CheckOrderIdempotency.scala
@@ -0,0 +1,5 @@
+
+object Test {
+  def main(args: Array[String]): Unit =
+    IdempotencyCheck.checkIdempotency("../out/orderIdempotency1", "../out/orderIdempotency2")
+}
diff --git a/tests/idempotency/CheckPosIdempotency.scala b/tests/idempotency/CheckPosIdempotency.scala
@@ -0,0 +1,5 @@
+
+object Test {
+  def main(args: Array[String]): Unit =
+    IdempotencyCheck.checkIdempotency("../out/posIdempotency1", "../out/posIdempotency2")
+}
diff --git a/tests/idempotency/CheckStrawmanIdempotency.scala b/tests/idempotency/CheckStrawmanIdempotency.scala
@@ -0,0 +1,11 @@
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    IdempotencyCheck.checkIdempotency("../out/idempotency/strawman0", "../out/idempotency/strawman1")
+    // FIXME: #2964 and maybe more
+    /*
+    IdempotencyCheck.checkIdempotency("../out/idempotency/strawman1", "../out/idempotency/strawman2")
+    IdempotencyCheck.checkIdempotency("../out/idempotency/strawman1", "../out/idempotency/strawman3")
+    */
+  }
+}
diff --git a/tests/idempotency/Checker.scala b/tests/idempotency/Checker.scala
diff --git a/tests/idempotency/IdempotencyCheck.scala b/tests/idempotency/IdempotencyCheck.scala
@@ -13,31 +13,32 @@ object IdempotencyCheck {
     "pos/i2345/Whatever"
   )
 
-  def checkIdempotency(dirPrefix: String): Unit = {
+  def checkIdempotency(dir1: String, dir2: String): Unit = {
     var failed = 0
     var total = 0
 
     val groupedBytecodeFiles: List[(JPath, JPath, JPath, JPath)] = {
       val bytecodeFiles = {
-        def bytecodeFiles(paths: JStream[JPath]): List[JPath] = {
+        def bytecodeFiles(paths: JStream[JPath], dir: String): List[(String, JPath)] = {
           def isBytecode(file: String) = file.endsWith(".class") || file.endsWith(".tasty")
-          paths.iterator.asScala.filter(path => isBytecode(path.toString)).toList
+          def tupleWithName(f: JPath) = (f.toString.substring(dir.length + 1, f.toString.length - 6), f)
+          paths.iterator.asScala.filter(path => isBytecode(path.toString)).map(tupleWithName).toList
         }
-        val compilerDir1 = JPaths.get(dirPrefix + 1)
-        val compilerDir2 = JPaths.get(dirPrefix + 2)
-        bytecodeFiles(JFiles.walk(compilerDir1)) ++ bytecodeFiles(JFiles.walk(compilerDir2))
+        val compilerDir1 = JPaths.get(dir1)
+        val compilerDir2 = JPaths.get(dir2)
+        bytecodeFiles(JFiles.walk(compilerDir1), dir1) ++ bytecodeFiles(JFiles.walk(compilerDir2), dir2)
       }
-      val groups = bytecodeFiles.groupBy(f => f.toString.substring(dirPrefix.length + 1, f.toString.length - 6))
+      val groups = bytecodeFiles.groupBy(_._1).mapValues(_.map(_._2))
 
       groups.filterNot(x => blacklisted(x._1)).valuesIterator.flatMap { g =>
-        def pred(f: JPath, i: Int, isTasty: Boolean) =
-          f.toString.contains(dirPrefix + i) && f.toString.endsWith(if (isTasty) ".tasty" else ".class")
-        val class1 = g.find(f => pred(f, 1, isTasty = false))
-        val class2 = g.find(f => pred(f, 2, isTasty = false))
-        val tasty1 = g.find(f => pred(f, 1, isTasty = true))
-        val tasty2 = g.find(f => pred(f, 2, isTasty = true))
-        assert(class1.isDefined, s"Could not find class in ${dirPrefix + 1} for $class2")
-        assert(class2.isDefined, s"Could not find class in ${dirPrefix + 2} for $class1")
+        def pred(f: JPath, dir: String, isTasty: Boolean) =
+          f.toString.contains(dir) && f.toString.endsWith(if (isTasty) ".tasty" else ".class")
+        val class1 = g.find(f => pred(f, dir1, isTasty = false))
+        val class2 = g.find(f => pred(f, dir2, isTasty = false))
+        val tasty1 = g.find(f => pred(f, dir1, isTasty = true))
+        val tasty2 = g.find(f => pred(f, dir2, isTasty = true))
+        assert(class1.isDefined, s"Could not find class in ${dir1} for $class2")
+        assert(class2.isDefined, s"Could not find class in ${dir2} for $class1")
         if (tasty1.isEmpty || tasty2.isEmpty) Nil
         else List(Tuple4(class1.get, tasty1.get, class2.get, tasty2.get))
       }.toList
diff --git a/tests/order-idempotency/listTest/App.scala b/tests/order-idempotency/listTest/App.scala
@@ -0,0 +1,6 @@
+object App {
+  val list1 = new C(2, N)
+  val list2 = new C(2, list1)
+  list2.head
+  list2.tail
+}
diff --git a/tests/order-idempotency/listTest/C.scala b/tests/order-idempotency/listTest/C.scala
@@ -0,0 +1 @@
+class C[+T](val head: T, val tail: L[T]) extends L[T]
diff --git a/tests/order-idempotency/listTest/L.scala b/tests/order-idempotency/listTest/L.scala
@@ -0,0 +1,4 @@
+trait L[+T] {
+  def head: T
+  def tail: L[T]
+}
diff --git a/tests/order-idempotency/listTest/N.scala b/tests/order-idempotency/listTest/N.scala
@@ -0,0 +1,4 @@
+object N extends L[Nothing] {
+  def head = ???
+  def tail = ???
+}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`	`2`	`object Test {`
`3`	`3`	`def main(args: Array[String]): Unit =`
`4`		`- IdempotencyCheck.checkIdempotency("../out/dotty")`
	`4`	`+ IdempotencyCheck.checkIdempotency("../out/dotty1", "../out/dotty2")`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+class C[+T](val head: T, val tail: L[T]) extends L[T]`