fix #1274: test for dotty bootstrap based on tasty

Author: liufengyun

project/Build.scala

@@ -172,13 +172,7 @@ object DottyBuild extends Build {
       // http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala
       javaOptions <++= (dependencyClasspath in Runtime, packageBin in Compile) map { (attList, bin) =>
         // put the Scala {library, reflect} in the classpath
-        val path = for {
-          file <- attList.map(_.data)
-          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
-        // System.err.println("BOOTPATH: " + fullpath)
+        val fullpath = List("-classpath",  attList.map(_.data.getAbsolutePath).mkString(":"))
 
         val travis_build = // propagate if this is a travis build
           if (sys.props.isDefinedAt(JENKINS_BUILD))

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

@@ -220,13 +220,14 @@ class PathResolver(implicit ctx: Context) {
     import context._
 
     // Assemble the elements!
+    // Scala application class path takes precedence
     def basis = List[Traversable[ClassPath]](
-      classesInPath(javaBootClassPath),             // 1. The Java bootstrap class path.
-      contentsOfDirsInPath(javaExtDirs),            // 2. The Java extension class path.
-      classesInExpandedPath(javaUserClassPath),     // 3. The Java application class path.
-      classesInPath(scalaBootClassPath),            // 4. The Scala boot class path.
-      contentsOfDirsInPath(scalaExtDirs),           // 5. The Scala extension class path.
-      classesInExpandedPath(userClassPath),         // 6. The Scala application class path.
+      classesInExpandedPath(userClassPath),         // 1. The Scala application class path.
+      classesInPath(javaBootClassPath),             // 2. The Java bootstrap class path.
+      contentsOfDirsInPath(javaExtDirs),            // 3. The Java extension class path.
+      classesInExpandedPath(javaUserClassPath),     // 4. The Java application class path.
+      classesInPath(scalaBootClassPath),            // 5. The Scala boot class path.
+      contentsOfDirsInPath(scalaExtDirs),           // 6. The Scala extension class path.
       sourcesInPath(sourcePath)                     // 7. The Scala source path.
     )
 

test/dotc/tests.scala

@@ -23,7 +23,7 @@ class tests extends CompilerTest {
   val defaultOutputDir = "./out/"
 
   implicit val defaultOptions = noCheckOptions ++ List(
-      "-Yno-deep-subtypes", "-Yno-double-bindings", "-Yforce-sbt-phases",
+      "-usejavacp", "-Yno-deep-subtypes", "-Yno-double-bindings", "-Yforce-sbt-phases",
       "-d", defaultOutputDir) ++ {
     if (isRunByJenkins) List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") // should be Ycheck:all, but #725
     else List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef")
@@ -288,4 +288,23 @@ class tests extends CompilerTest {
   @Test def tasty_dotc_util = compileDir(dotcDir, "util", testPickling)
   @Test def tasty_tools_io = compileDir(toolsDir, "io", testPickling)
   @Test def tasty_tests = compileDir(testsDir, "tasty", testPickling)
+
+  @Test def tasty_bootstrap = {
+    val opt = List("-classpath", defaultOutputDir)
+    // first compile dotty
+    compileDir(dottyDir, ".", List("-deep", "-Ycheck-reentrant", "-strict"))(allowDeepSubtypes)
+
+    compileDir(dottyDir, "tools", opt)
+    compileDir(toolsDir, "dotc", opt)
+    compileDir(dotcDir, "ast", opt)
+    compileDir(dotcDir, "config", opt)
+    compileDir(dotcDir, "parsing", opt)
+    compileDir(dotcDir, "printing", opt)
+    compileDir(dotcDir, "repl", opt)
+    compileDir(dotcDir, "reporting", opt)
+    compileDir(dotcDir, "rewrite", opt)
+    compileDir(dotcDir, "transform", opt)
+    compileDir(dotcDir, "typer", opt)
+    compileDir(dotcDir, "util", opt)
+  }
 }

test/test/CompilerTest.scala

@@ -209,7 +209,7 @@ abstract class CompilerTest {
     val path = s"$prefix$fileName"
     val f = new PlainFile(path)
     val repl = new TestREPL(new String(f.toCharArray))
-    repl.process(Array[String]())
+    repl.process(Array[String]("-usejavacp"))
     repl.check()
   }