Create dotty-lib.jar for run tests

Author: felixmulder

.gitignore

@@ -31,6 +31,7 @@ classes/
 
 # Partest
 dotty.jar
+dotty-lib.jar
 tests/partest-generated/
 tests/locks/
 /test-classes/

bin/common

@@ -86,7 +86,7 @@ function build_all {
     printf "done\n"
 
     printf "Building dotty-compiler..."
-    MAIN_JAR=$(build_jar package "target/scala-$SCALA_BINARY_VERSION")
+    MAIN_JAR=$(build_jar dotty-compiler/package "target/scala-$SCALA_BINARY_VERSION")
     printf "done\n"
 
     printf "Building dotty library..."
@@ -131,7 +131,7 @@ function check_jar {
 }
 
 check_jar "dotty-interfaces" $INTERFACES_JAR "interfaces" 'INTERFACES_JAR=$(build_jar dotty-interfaces/package interfaces/target)'
-check_jar "dotty"            $MAIN_JAR       "src"        'MAIN_JAR=$(build_jar package target/scala-$SCALA_BINARY_VERSION)'
+check_jar "dotty"            $MAIN_JAR       "src"        'MAIN_JAR=$(build_jar dotty-compiler/package target/scala-$SCALA_BINARY_VERSION)'
 check_jar "dotty-library"    $DOTTY_LIB_JAR  "library"    'DOTTY_LIB_JAR=$(build_jar dotty-library/package library/target/scala-$SCALA_BINARY_VERSION)'
 check_jar "dotty-tests"      $TEST_JAR       "test"       'TEST_JAR=$(build_jar test:package target/scala-$SCALA_BINARY_VERSION /dotty.*-tests\.jar/p)'
 

library/src/dotty/runtime/LegacyApp.scala

@@ -1,9 +1,8 @@
 package dotty.runtime
 
-
-/**
- * replaces the `scala.App` class which relies on `DelayedInit` functionality, not supported by Dotty.
- */
+/** Replaces the `scala.App` class which relies on `DelayedInit` functionality,
+  * not supported by Dotty.
+  */
 class LegacyApp {
   def main(args: Array[String]): Unit = ()
 }

project/Build.scala

@@ -137,7 +137,7 @@ object DottyBuild extends Build {
         val args = Def.spaceDelimited("<arg>").parsed
         val jars = Seq((packageBin in Compile).value.getAbsolutePath) ++
             getJarPaths(partestDeps.value, ivyPaths.value.ivyHome)
-        val dottyJars  = "-dottyJars " + (jars.length + 2) + " dotty.jar dotty-lib.jar" + " " + jars.mkString(" ")
+        val dottyJars  = "-dottyJars " + (jars.length + 1) + " dotty-lib.jar" + " " + jars.mkString(" ")
         // Provide the jars required on the classpath of run tests
         runTask(Test, "dotty.partest.DPConsoleRunner", dottyJars + " " + args.mkString(" "))
       },
@@ -191,7 +191,7 @@ object DottyBuild extends Build {
           path = file.getAbsolutePath
         } yield "-Xbootclasspath/p:" + path
         // dotty itself needs to be in the bootclasspath
-        val fullpath = ("-Xbootclasspath/p:" + "dotty.jar") :: ("-Xbootclasspath/a:" + bin) :: path.toList
+        val fullpath = /*("-Xbootclasspath/p:" + "dotty.jar") ::*/ ("-Xbootclasspath/a:" + bin) :: path.toList
         // System.err.println("BOOTPATH: " + fullpath)
 
         val travis_build = // propagate if this is a travis build
@@ -211,10 +211,33 @@ object DottyBuild extends Build {
       }
     ).
     settings(
-      addCommandAlias("partest",                   ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test;runPartestRunner") ++
-      addCommandAlias("partest-only",              ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test-only dotc.tests;runPartestRunner") ++
-      addCommandAlias("partest-only-no-bootstrap", ";test:package;package;                        lockPartestFile;test:test-only dotc.tests;runPartestRunner") ++
-      addCommandAlias("dottydoc", ";dottydoc/run")
+      addCommandAlias(
+        "partest",
+        ";test:package" +
+        ";dotty-compiler/package" +
+        ";dotty-library/package" +
+        ";test:runMain dotc.build" +
+        ";lockPartestFile" +
+        ";test:test" +
+        ";runPartestRunner"
+      ) ++
+      addCommandAlias("partest-only",
+        ";test:package" +
+        ";dotty-compiler/package" +
+        ";dotty-library/package" +
+        ";test:runMain dotc.build" +
+        ";lockPartestFile" +
+        ";test:test-only dotc.tests" +
+        ";runPartestRunner"
+      ) ++
+      addCommandAlias(
+        "partest-only-no-bootstrap",
+        ";test:package" +
+        ";package" +
+        ";lockPartestFile" +
+        ";test:test-only dotc.tests" +
+        ";runPartestRunner"
+      )
     ).
     settings(publishing)
 

src/dotty/tools/dotc/config/JavaPlatform.scala

@@ -16,7 +16,9 @@ class JavaPlatform extends Platform {
   def classPath(implicit ctx: Context): ClassPath = {
     if (currentClassPath.isEmpty)
       currentClassPath = Some(new PathResolver().result)
-    currentClassPath.get
+    val cp = currentClassPath.get
+    println(cp)
+    cp
   }
 
   // The given symbol is a method with the right name and signature to be a runnable java program.

src/dotty/tools/dotc/config/PathResolver.scala

@@ -46,7 +46,23 @@ object PathResolver {
     def classPathEnv        =  envOrElse("CLASSPATH", "")
     def sourcePathEnv       =  envOrElse("SOURCEPATH", "")
 
-    def javaBootClassPath   = propOrElse("sun.boot.class.path", searchForBootClasspath)
+    def javaBootClassPath   =
+      propOrElse("sun.boot.class.path", searchForBootClasspath)
+        .split(":")
+        .filterNot { jar =>
+          // This classpath gets propagated to the compiled resources and as
+          // such needs to be purged of things that should not be on the
+          // compiled programs' classpath:
+          jar.contains("dotty-compiler") ||
+          jar.contains("dotty-library") ||
+          jar.contains("dotty-interfaces") ||
+          // let's blacklist locally compiled classes:
+          jar.contains("dotty/library/target") ||
+          jar.contains("dotty/interfaces/target") ||
+          jar.contains("dotty/target/scala-2.11")
+        }
+        .mkString(":")
+
     def javaExtDirs         = propOrEmpty("java.ext.dirs")
     def scalaHome           = propOrEmpty("scala.home")
     def scalaExtDirs        = propOrEmpty("scala.ext.dirs")
@@ -213,11 +229,11 @@ class PathResolver(implicit ctx: Context) {
      *  - Otherwise, if CLASSPATH is set, it is that
      *  - If neither of those, then "." is used.
      */
-    def userClassPath = (
+    def userClassPath = {
       if (!settings.classpath.isDefault)
         settings.classpath.value
       else sys.env.getOrElse("CLASSPATH", ".")
-    )
+    }
 
     import context._
 

test/dotc/build.scala

@@ -16,15 +16,25 @@ object build extends tests {
         }
     }
     if(deleteFolder) folder.delete()
-}
+  }
 
-  def main(args: Array[String]): Unit = {
-    println("------------  Building dotty  ------------")
+  def clearOutput() = {
     deleteFilesInFolder(new File(defaultOutputDir)) // clear previous output
     val keepFile = new File(defaultOutputDir + ".keep")
     keepFile.createNewFile()
-    dotty // build output dir
-    val p = Runtime.getRuntime.exec(Array("jar", "cf", "dotty.jar", "-C", "out", "."))
-    p.waitFor()
+  }
+
+  def main(args: Array[String]): Unit = {
+    println("----------  Building bootstrapped dotty-lib  ----------------------------------------------")
+    clearOutput()
+    dottyBootedLib
+    val p1 = Runtime.getRuntime.exec(Array("jar", "cf", "dotty-lib.jar", "-C", "out", "."))
+    p1.waitFor()
+
+    println("----------  Building bootstrapped dotty depending on dotty-lib compiled by dotty ----------")
+    clearOutput()
+    dottyDependsOnBootedLib
+    val p2 = Runtime.getRuntime.exec(Array("jar", "cf", "dotty.jar", "-C", "out", "."))
+    p2.waitFor()
   }
 }

test/dotc/tests.scala

@@ -14,19 +14,26 @@ class tests extends CompilerTest {
   val defaultOutputDir = "./out/"
 
   val noCheckOptions = List(
-//        "-verbose",
-//         "-Ylog:frontend",
-//        "-Xprompt",
-//        "-explaintypes",
-//        "-Yshow-suppressed-errors",
-        "-d", defaultOutputDir,
-        "-pagewidth", "160")
-
-  implicit val defaultOptions = noCheckOptions ++
-    List("-Yno-deep-subtypes", "-Yno-double-bindings", "-Yforce-sbt-phases", "-color:never") ++ {
-      if (isRunByJenkins) List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") // should be Ycheck:all, but #725
-      else List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef")
-    }
+//    "-verbose",
+//    "-Ylog:frontend",
+//    "-Xprompt",
+//    "-explaintypes",
+//    "-Yshow-suppressed-errors",
+    "-d", defaultOutputDir,
+    "-pagewidth", "80"
+  )
+
+  implicit val defaultOptions = noCheckOptions ++ {
+    if (isRunByJenkins) List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") // should be Ycheck:all, but #725
+    else List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef")
+  } ++ List(
+    "-Yno-deep-subtypes",
+    "-Yno-double-bindings",
+    "-Yforce-sbt-phases",
+    "-color:never",
+    "-classpath",
+    "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar"
+  )
 
   val testPickling = List("-Xprint-types", "-Ytest-pickler", "-Ystop-after:pickler", "-Yprintpos")
 
@@ -58,6 +65,7 @@ class tests extends CompilerTest {
   val parsingDir = dotcDir + "parsing/"
   val dottyReplDir   = dotcDir + "repl/"
   val typerDir  = dotcDir + "typer/"
+  val libDir = "./library/src/"
 
   @Before def cleanup(): Unit = {
     // remove class files from stdlib and tests compilation
@@ -177,7 +185,31 @@ class tests extends CompilerTest {
         |./scala-scala/src/library/scala/collection/generic/GenSeqFactory.scala""".stripMargin)
   @Test def compileIndexedSeq = compileLine("./scala-scala/src/library/scala/collection/immutable/IndexedSeq.scala")
 
-  @Test def dotty = compileDir(dottyDir, ".", List("-deep", "-Ycheck-reentrant", "-strict"))(allowDeepSubtypes) // note the -deep argument
+  // Not a junit test anymore since it is order dependent
+  def dottyBootedLib = compileDir(
+    libDir,
+    ".",
+    List(
+      "-deep", "-Ycheck-reentrant", "-strict", "-classpath", defaultOutputDir +
+      ":./target/scala-2.11/dotty-compiler_2.11-0.1-SNAPSHOT.jar" //WAT???
+    )
+  )(allowDeepSubtypes) // note the -deep argument
+
+  // Not a junit test anymore since it is order dependent
+  def dottyDependsOnBootedLib = compileDir(
+    dottyDir,
+    ".",
+    List(
+      "-deep", "-Ycheck-reentrant", "-strict", "-classpath", defaultOutputDir +
+      ":./dotty-lib.jar" +
+      ":./interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar" +
+      // this needs to get compiled together with the compiler:
+      //":./target/scala-2.11/src_managed/main/scalajs-ir-src/"
+      // but falling back to:
+      ":/home/fixel/.ivy2/cache/org.scala-js/scalajs-ir_2.11/jars/scalajs-ir_2.11-0.6.8.jar"
+      // for the time being.
+    )
+  )(allowDeepSubtypes) // note the -deep argument
 
   @Test def dotc_ast = compileDir(dotcDir, "ast")
   @Test def dotc_config = compileDir(dotcDir, "config")
@@ -231,8 +263,8 @@ class tests extends CompilerTest {
   // Disabled because we get stale symbol errors on the SourceFile annotation, which is normal.
   // @Test def tasty_annotation_internal = compileDir(s"${dottyDir}annotation/", "internal", testPickling)
 
-  @Test def tasty_runtime = compileDir(s"$dottyDir", "runtime", testPickling)
-  @Test def tasty_runtime_vc = compileDir(s"${dottyDir}runtime/", "vc", testPickling)
+  @Test def tasty_runtime = compileDir(s"${libDir}dotty/", "runtime", testPickling)
+  @Test def tasty_runtime_vc = compileDir(s"${libDir}dotty/runtime/", "vc", testPickling)
 
   @Test def tasty_tools = compileDir(dottyDir, "tools", testPickling)