Move compiler and compiler tests to compiler dir

Author: felixmulder

bench/src/test/scala/Benchmarks.scala

@@ -6,7 +6,7 @@ import org.scalameter.PerformanceTest.OnlineRegressionReport
 import org.scalameter.api._
 import org.scalameter.{Context, History, currentContext, persistence}
 import org.scalameter.reporting.RegressionReporter.Tester
-import test.CompilerTest
+import dotty.tools.dotc.CompilerTest
 
 import scala.io.Source
 
@@ -46,13 +46,14 @@ object BenchTests extends OnlineRegressionReport {
   implicit val defaultOptions = List("-d", outputDir)
   val scala2mode = List("-language:Scala2")
 
-  val dottyDir  = "./src/dotty/"
+  val dottyDir  = "../compiler/src/dotty/"
 
-  val stdlibFiles = Source.fromFile("./test/dotc/scala-collections.whitelist", "UTF8").getLines()
+  val stdlibFiles = Source.fromFile("../compiler/test/dotc/scala-collections.whitelist", "UTF8").getLines()
     .map(_.trim) // allow identation
     .filter(!_.startsWith("#")) // allow comment lines prefixed by #
     .map(_.takeWhile(_ != '#').trim) // allow comments in the end of line
     .filter(_.nonEmpty)
+    .map("." + _)
     .toList
 
   def stdLib = compiler.compileList("compileStdLib", stdlibFiles, "-migration" :: scala2mode)

bin/common

@@ -86,15 +86,15 @@ function build_all {
     printf "done\n"
 
     printf "Building dotty-compiler..."
-    MAIN_JAR=$(build_jar dotty-compiler/package "target/scala-$SCALA_BINARY_VERSION")
+    MAIN_JAR=$(build_jar dotty-compiler/package "compiler/target/scala-$SCALA_BINARY_VERSION")
     printf "done\n"
 
     printf "Building dotty library..."
     DOTTY_LIB_JAR=$(build_jar dotty-library/package "library/target/scala-$SCALA_BINARY_VERSION")
     printf "done\n"
 
     printf "Building tests..."
-    TEST_JAR=$(build_jar test:package "target/scala-$SCALA_BINARY_VERSION" '/dotty.*-tests\.jar/p')
+    TEST_JAR=$(build_jar test:package "compiler/target/scala-$SCALA_BINARY_VERSION" '/dotty.*-tests\.jar/p')
     printf "done\n"
 
     update_packages
@@ -130,10 +130,10 @@ function check_jar {
     fi
 }
 
-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 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)'
+check_jar "dotty-interfaces" $INTERFACES_JAR "interfaces/src" 'INTERFACES_JAR=$(build_jar dotty-interfaces/package interfaces/target)'
+check_jar "dotty"            $MAIN_JAR       "compiler/src"   'MAIN_JAR=$(build_jar dotty-compiler/package compiler/target/scala-$SCALA_BINARY_VERSION)'
+check_jar "dotty-library"    $DOTTY_LIB_JAR  "library/src"    'DOTTY_LIB_JAR=$(build_jar dotty-library/package library/target/scala-$SCALA_BINARY_VERSION)'
+check_jar "dotty-tests"      $TEST_JAR       "compiler/test"  'TEST_JAR=$(build_jar dotty-compiler/test:package compiler/target/scala-$SCALA_BINARY_VERSION /dotty.*-tests\.jar/p)'
 
 # Autodetecting the scala-library location, in case it wasn't provided by an environment variable
 if [ "$SCALA_LIBRARY_JAR" == "" ]; then

bin/test/TestScripts.scala

@@ -28,13 +28,13 @@ class TestScripts {
     }
 
     try {
-      for (jar <- Source.fromFile("../.packages").getLines())
+      for (jar <- Source.fromFile("./.packages").getLines())
         delete(jar)
 
-      delete("../.packages")
-      delete("./src/dotty/tools/dotc/Dummy.scala")
-      delete("HelloWorld.class")
-      delete("HelloWorld$.class")
+      delete("./.packages")
+      delete("./compiler/src/dotty/tools/dotc/Dummy.scala")
+      delete("./HelloWorld.class")
+      delete("./HelloWorld$.class")
     } catch {
       case _: FileNotFoundException => ()
     }
@@ -66,11 +66,11 @@ class TestScripts {
    *  rebuild dotty if needed
    */
   @Test def rebuildIfNecessary = doUnlessWindows {
-    val (retFirstBuild, _) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala")
-    assert(retFirstBuild == 0, "building dotc failed")
+    val (retFirstBuild, out1) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala")
+    assert(retFirstBuild == 0, s"building dotc failed: $out1")
 
     // Create a new file to force rebuild
-    new JFile("./src/dotty/tools/dotc/Dummy.scala").createNewFile()
+    new JFile("./compiler/src/dotty/tools/dotc/Dummy.scala").createNewFile()
 
     val (retSecondBuild, output) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala")
     assert(

compiler/after-pickling.txt

@@ -0,0 +1 @@
+[cannot display due to dotty.tools.dotc.core.Denotations$StaleSymbol: stale symbol; method <init>#55366 in class sharable, defined in Period(1..6, run = 2), is referred to in run Period(1..1, run = 3), raw string = dotty.tools.dotc.printing.Formatting$StringFormatter@7a82387f]