CompilationTests.tastyBootstrap: Avoid hardcoding path

The hardcoded scala-2.12 won't be valid once we bootstrap.

Author: smarter

compiler/test/dotty/Properties.scala

@@ -1,5 +1,7 @@
 package dotty
 
+import java.nio.file._
+
 /** Runtime properties from defines or environmnent */
 object Properties {
 
@@ -36,6 +38,9 @@ object Properties {
    */
   val testsSafeMode: Boolean = sys.props.isDefinedAt("dotty.tests.safemode")
 
+  /** Extra directory containing sources for the compiler */
+  def dottyCompilerManagedSources: Path = Paths.get(sys.props("dotty.tests.dottyCompilerManagedSources"))
+
   /** dotty-interfaces jar */
   def dottyInterfaces: String = sys.props("dotty.tests.classes.dottyInterfaces")
 

compiler/test/dotty/tools/TestSources.scala

@@ -62,7 +62,7 @@ object TestSources {
       (fileName.endsWith(".scala") || fileName.endsWith(".java")) && !excludedFiles.contains(fileName)
     }
 
-    assert(Files.isDirectory(path))
+    assert(Files.isDirectory(path), s"Not a directory: $path")
     val files = if (shallow) Files.list(path) else Files.walk(path)
     try {
       val sources = files

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

@@ -239,12 +239,10 @@ class CompilationTests extends ParallelTesting {
         defaultOptions.and("-Ycheck-reentrant", "-strict", "-priorityclasspath", defaultOutputDir))(libGroup)
 
     val compilerSources = sources(Paths.get("compiler/src"))
+    val compilerManagedSources = sources(Properties.dottyCompilerManagedSources)
 
-    val scalaJSIRDir = Paths.get("compiler/target/scala-2.12/src_managed/main/scalajs-ir-src/org/scalajs/ir")
-    val scalaJSIRSources = sources(scalaJSIRDir, shallow = true)
-
-    val dotty1 = compileList("dotty", compilerSources ++ scalaJSIRSources, opt)(dotty1Group)
-    val dotty2 = compileList("dotty", compilerSources ++ scalaJSIRSources, opt)(dotty2Group)
+    val dotty1 = compileList("dotty", compilerSources ++ compilerManagedSources, opt)(dotty1Group)
+    val dotty2 = compileList("dotty", compilerSources ++ compilerManagedSources, opt)(dotty2Group)
 
     val tests = {
       lib.keepOutput :: dotty1.keepOutput :: {
@@ -262,7 +260,7 @@ class CompilationTests extends ParallelTesting {
         compileShallowFilesInDir("compiler/src/dotty/tools/dotc/util", opt) +
         compileShallowFilesInDir("compiler/src/dotty/tools/backend", opt) +
         compileShallowFilesInDir("compiler/src/dotty/tools/backend/jvm", opt) +
-        compileList("shallow-scalajs-ir", scalaJSIRSources, opt)
+        compileList("managed-sources", compilerManagedSources, opt)
       }.keepOutput :: Nil
     }.map(_.checkCompile())
 

project/Build.scala

@@ -461,6 +461,7 @@ object Build {
           else List()
 
         val jarOpts = List(
+          "-Ddotty.tests.dottyCompilerManagedSources=" + (sourceManaged in Compile).value,
           "-Ddotty.tests.classes.dottyInterfaces=" + jars("dotty-interfaces"),
           "-Ddotty.tests.classes.dottyLibrary=" + jars("dotty-library"),
           "-Ddotty.tests.classes.dottyCompiler=" + jars("dotty-compiler"),