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(

src/dotty/tools/backend/jvm/CollectEntryPoints.scala renamed to compiler/src/dotty/tools/backend/jvm/CollectEntryPoints.scala

@@ -12,7 +12,7 @@ class tests extends CompilerTest {
 
   def isRunByJenkins: Boolean = sys.props.isDefinedAt("dotty.jenkins.build")
 
-  val defaultOutputDir = "./out/"
+  val defaultOutputDir = "../out/"
 
   val noCheckOptions = List(
 //    "-verbose",
@@ -33,9 +33,9 @@ class tests extends CompilerTest {
 
   val classPath = {
     val paths = List(
-      "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar",
+      "../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar",
       "./target/scala-2.11/dotty-compiler_2.11-0.1-SNAPSHOT.jar",
-      "./interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar"
+      "../interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar"
     ).map { p =>
       val file = new JFile(p)
       assert(
@@ -65,7 +65,7 @@ class tests extends CompilerTest {
   val explicitUTF8 = List("-encoding", "UTF8")
   val explicitUTF16 = List("-encoding", "UTF16")
 
-  val testsDir      = "./tests/"
+  val testsDir      = "../tests/"
   val posDir        = testsDir + "pos/"
   val posSpecialDir = testsDir + "pos-special/"
   val posScala2Dir  = testsDir + "pos-scala2/"
@@ -83,7 +83,7 @@ class tests extends CompilerTest {
   val parsingDir = dotcDir + "parsing/"
   val dottyReplDir   = dotcDir + "repl/"
   val typerDir  = dotcDir + "typer/"
-  val libDir = "./library/src/"
+  val libDir = "../library/src/"
 
   @Before def cleanup(): Unit = {
     // remove class files from stdlib and tests compilation
@@ -190,18 +190,19 @@ class tests extends CompilerTest {
    .filter(!_.startsWith("#")) // allow comment lines prefixed by #
    .map(_.takeWhile(_ != '#').trim) // allow comments in the end of line
    .filter(_.nonEmpty)
+   .map("." + _) // files are contained one dir up
    .toList
 
   @Test def compileStdLib = compileList("compileStdLib", stdlibFiles, "-migration" :: "-Yno-inline" :: scala2mode)
   @Test def compileMixed = compileLine(
-      """tests/pos/B.scala
-        |./scala-scala/src/library/scala/collection/immutable/Seq.scala
-        |./scala-scala/src/library/scala/collection/parallel/ParSeq.scala
-        |./scala-scala/src/library/scala/package.scala
-        |./scala-scala/src/library/scala/collection/GenSeqLike.scala
-        |./scala-scala/src/library/scala/collection/SeqLike.scala
-        |./scala-scala/src/library/scala/collection/generic/GenSeqFactory.scala""".stripMargin)
-  @Test def compileIndexedSeq = compileLine("./scala-scala/src/library/scala/collection/immutable/IndexedSeq.scala")
+      """../tests/pos/B.scala
+        |../scala-scala/src/library/scala/collection/immutable/Seq.scala
+        |../scala-scala/src/library/scala/collection/parallel/ParSeq.scala
+        |../scala-scala/src/library/scala/package.scala
+        |../scala-scala/src/library/scala/collection/GenSeqLike.scala
+        |../scala-scala/src/library/scala/collection/SeqLike.scala
+        |../scala-scala/src/library/scala/collection/generic/GenSeqFactory.scala""".stripMargin)
+  @Test def compileIndexedSeq = compileLine("../scala-scala/src/library/scala/collection/immutable/IndexedSeq.scala")
 
   // Not a junit test anymore since it is order dependent
   def dottyBootedLib = compileDir(libDir, ".")(allowDeepSubtypes) // note the -deep argument

src/dotty/tools/backend/jvm/CollectSuperCalls.scala renamed to compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala

@@ -23,7 +23,7 @@ object DPConfig {
    */
   val runJVMOpts = s"-Xms64M -Xmx1024M ${PartestDefaults.javaOpts}"
 
-  val testRoot = (Path(".") / Path("tests") / Path("partest-generated")).toString
+  val testRoot = (Path("..") / Path("tests") / Path("partest-generated")).toString
   val genLog = Path(testRoot) / Path("gen.log")
 
   lazy val testDirs = {

src/dotty/tools/backend/jvm/DottyBackendInterface.scala renamed to compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala

@@ -25,7 +25,7 @@ class DottyTest extends ContextEscapeDetection{
     ctx.setSetting(ctx.settings.encoding, "UTF8")
     ctx.setSetting(
       ctx.settings.classpath,
-      "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar"
+      "../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar"
     )
     // when classpath is changed in ctx, we need to re-initialize to get the
     // correct classpath from PathResolver

src/dotty/tools/backend/jvm/GenBCode.scala renamed to compiler/src/dotty/tools/backend/jvm/GenBCode.scala

@@ -18,8 +18,8 @@ class ShowClassTests extends DottyTest {
     ctx.setSetting(ctx.settings.encoding, "UTF8")
     ctx.setSetting(
       ctx.settings.classpath,
-      "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" +
-      ":./interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar"
+      "../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" +
+      ":../interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar"
     )
     base.initialize()(ctx)
     ctx

src/dotty/tools/backend/jvm/LabelDefs.scala renamed to compiler/src/dotty/tools/backend/jvm/LabelDefs.scala

@@ -63,7 +63,7 @@ abstract class CompilerTest {
     if (pid == null)
       false
     else
-      new JFile("." + JFile.separator + "tests" + JFile.separator + "locks" + JFile.separator + s"partest-$pid.lock").exists
+      new JFile(".." + JFile.separator + "tests" + JFile.separator + "locks" + JFile.separator + s"partest-$pid.lock").exists
   }
 
   // Delete generated files from previous run and create new log

src/dotty/tools/backend/jvm/scalaPrimitives.scala renamed to compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala

@@ -18,14 +18,14 @@ import scala.collection.mutable.ListBuffer
  */
 class EntryPointsTest {
   private val sources =
-    List("./tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath())
+    List("../tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath())
   private val dottyInterfaces =
-    new java.io.File("./interfaces/dotty-interfaces-0.1-SNAPSHOT.jar").getPath
+    new java.io.File("../interfaces/dotty-interfaces-0.1-SNAPSHOT.jar").getPath
   private val dottyLibrary =
-    new java.io.File("./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar").getPath
+    new java.io.File("../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar").getPath
   private val args =
     sources ++
-    List("-d", "./out/") ++
+    List("-d", "../out/") ++
     List("-classpath", dottyInterfaces + ":" + dottyLibrary)
 
   @Test def runCompiler = {

src/dotty/tools/dotc/Bench.scala renamed to compiler/src/dotty/tools/dotc/Bench.scala

@@ -19,15 +19,15 @@ import scala.collection.mutable.ListBuffer
 class InterfaceEntryPointTest {
   @Test def runCompilerFromInterface = {
     val sources =
-      List("./tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath())
+      List("../tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath())
     val dottyInterfaces =
-      new java.io.File("./interfaces/dotty-interfaces-0.1-SNAPSHOT.jar").getPath
+      new java.io.File("../interfaces/dotty-interfaces-0.1-SNAPSHOT.jar").getPath
     val dottyLibrary =
-      new java.io.File("./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar").getPath
+      new java.io.File("../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar").getPath
 
     val args =
       sources ++
-      List("-d", "./out/") ++
+      List("-d", "../out/") ++
       List("-classpath", dottyInterfaces + ":" + dottyLibrary)
 
     val mainClass = Class.forName("dotty.tools.dotc.Main")