Fix #3664: Make testAll part of commonSettings

allanrenucci · allanrenucci · commit 32b02dce2cc8 · 2017-12-13T17:41:30.000+01:00
`testAll` is used to run the tests in the CI. However it was defined
in `commonDottyCompilerSettings` and therefore not defined for all the
projects.

This commit also, clean the sbt build
diff --git a/project/Build.scala b/project/Build.scala
@@ -121,10 +121,17 @@ object Build {
     // Change this to true if you want to bootstrap using a published non-bootstrapped compiler
     bootstrapFromPublishedJars := false,
 
+    // enable improved incremental compilation algorithm
+    incOptions := incOptions.value.withNameHashing(true),
+
     // Override `runCode` from sbt-dotty to use the language-server and
     // vscode extension from the source repository of dotty instead of a
     // published version.
-    runCode := (run in `dotty-language-server`).toTask("").value
+    runCode := (run in `dotty-language-server`).toTask("").value,
+
+    // include sources in eclipse (downloads source code for all dependencies)
+    //http://stackoverflow.com/questions/10472840/how-to-attach-sources-to-sbt-managed-dependencies-in-scala-ide#answer-11683728
+    EclipseKeys.withSource := true
   )
 
   // Settings shared globally (scoped in Global). Used in build.sbt
@@ -180,7 +187,22 @@ object Build {
     resourceDirectory in Test       := baseDirectory.value / "test-resources",
 
     // Prevent sbt from rewriting our dependencies
-    ivyScala ~= (_ map (_ copy (overrideScalaVersion = false)))
+    ivyScala ~= (_ map (_ copy (overrideScalaVersion = false))),
+
+    test in Test := {
+      // Exclude legacy tests by default
+      (testOnly in Test).toTask(" -- --exclude-categories=dotty.LegacyTests,dotty.SlowTests").value
+    },
+
+    testAll in Test := {
+      // Exclude legacy tests by default
+      (testOnly in Test).toTask(" -- --exclude-categories=dotty.LegacyTests").value
+    },
+
+    libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
+
+    // enable verbose exception messages for JUnit
+    testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "-a", "-v")
   )
 
   // Settings used for projects compiled only with Scala 2
@@ -345,9 +367,6 @@ object Build {
     connectInput in run := true,
     outputStrategy := Some(StdoutOutput),
 
-    // enable verbose exception messages for JUnit
-    testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"),
-
     javaOptions ++= (javaOptions in `dotty-compiler`).value,
     fork in run := true,
     fork in Test := true,
@@ -387,7 +406,6 @@ object Build {
     }.evaluated,
 
     libraryDependencies ++= Seq(
-      "com.novocode" % "junit-interface" % "0.11" % "test",
       "com.vladsch.flexmark" % "flexmark" % "0.11.1",
       "com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % "0.11.1",
       "com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % "0.11.1",
@@ -455,9 +473,6 @@ object Build {
         pairs.map(_._2)
       }.taskValue,
 
-      // Used by the backend
-      libraryDependencies += "org.scala-lang.modules" % "scala-asm" % "6.0.0-scala-1",
-
       // set system in/out for repl
       connectInput in run := true,
       outputStrategy := Some(StdoutOutput),
@@ -483,32 +498,73 @@ object Build {
         Seq(file)
       }.taskValue,
 
-      // include sources in eclipse (downloads source code for all dependencies)
-      //http://stackoverflow.com/questions/10472840/how-to-attach-sources-to-sbt-managed-dependencies-in-scala-ide#answer-11683728
-      com.typesafe.sbteclipse.plugin.EclipsePlugin.EclipseKeys.withSource := true,
-
       // get libraries onboard
-      libraryDependencies ++= Seq("com.typesafe.sbt" % "sbt-interface" % sbtVersion.value,
-                                  ("org.scala-lang.modules" %% "scala-xml" % "1.0.6").withDottyCompat(),
-                                  "com.novocode" % "junit-interface" % "0.11" % "test",
-                                  "org.scala-lang" % "scala-library" % scalacVersion % "test"),
-
-      // enable improved incremental compilation algorithm
-      incOptions := incOptions.value.withNameHashing(true),
+      libraryDependencies ++= Seq(
+        "org.scala-lang.modules" % "scala-asm" % "6.0.0-scala-1", // used by the backend
+        "com.typesafe.sbt" % "sbt-interface" % sbtVersion.value,
+        ("org.scala-lang.modules" %% "scala-xml" % "1.0.6").withDottyCompat(),
+        "org.scala-lang" % "scala-library" % scalacVersion % "test"
+      ),
 
       // For convenience, change the baseDirectory when running the compiler
       baseDirectory in (Compile, run) := baseDirectory.value / "..",
       // .. but not when running test
       baseDirectory in (Test, run) := baseDirectory.value,
 
-      test in Test := {
-        // Exclude legacy tests by default
-        (testOnly in Test).toTask(" -- --exclude-categories=dotty.LegacyTests,dotty.SlowTests").value
-      },
+      testOptions in Test += Tests.Argument(
+        TestFrameworks.JUnit, "--run-listener=dotty.tools.ContextEscapeDetector"
+      ),
+
+      // Spawn new JVM in run and test
+      fork in run := true,
+      fork in Test := true,
+      parallelExecution in Test := false,
+
+      // Add git-hash used to package the distribution to the manifest to know it in runtime and report it in REPL
+      packageOptions += ManifestAttributes(("Git-Hash", VersionUtil.gitHash)),
+
+      // http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala
+      // packageAll should always be run before tests
+      javaOptions ++= {
+        val attList = (dependencyClasspath in Runtime).value
+        val pA = packageAll.value
+
+        // put needed dependencies on classpath:
+        val path = for {
+          file <- attList.map(_.data)
+          path = file.getAbsolutePath
+          // FIXME: when we snip the cord, this should go bye-bye
+          if path.contains("scala-library") ||
+            // FIXME: currently needed for tests referencing scalac internals
+            path.contains("scala-reflect") ||
+            // FIXME: should go away when xml literal parsing is removed
+            path.contains("scala-xml") ||
+            // used for tests that compile dotty
+            path.contains("scala-asm") ||
+            // needed for the xsbti interface
+            path.contains("sbt-interface")
+        } yield "-Xbootclasspath/p:" + path
+
+        val ci_build = // propagate if this is a ci build
+          if (sys.props.isDefinedAt(JENKINS_BUILD))
+            List(s"-D$JENKINS_BUILD=${sys.props(JENKINS_BUILD)}") ::: jenkinsMemLimit
+          else if (sys.props.isDefinedAt(DRONE_MEM))
+            List("-Xmx" + sys.props(DRONE_MEM))
+          else List()
+
+        val tuning =
+          if (sys.props.isDefinedAt("Oshort"))
+            // Optimize for short-running applications, see https://github.com/lampepfl/dotty/issues/222
+            List("-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1")
+          else List()
+
+        val jars = List(
+          "-Ddotty.tests.classes.interfaces=" + pA("dotty-interfaces"),
+          "-Ddotty.tests.classes.library=" + pA("dotty-library"),
+          "-Ddotty.tests.classes.compiler=" + pA("dotty-compiler")
+        )
 
-      testAll in Test := {
-        // Exclude legacy tests by default
-        (testOnly in Test).toTask(" -- --exclude-categories=dotty.LegacyTests").value
+        jars ::: tuning ::: agentOptions ::: ci_build ::: path.toList
       },
 
       vulpix := Def.inputTaskDyn {
@@ -545,13 +601,7 @@ object Build {
       },
       run := dotc.evaluated,
       dotc := runCompilerMain().evaluated,
-      repl := runCompilerMain(repl = true).evaluated,
-
-      // enable verbose exception messages for JUnit
-      testOptions in Test += Tests.Argument(
-        TestFrameworks.JUnit, "-a", "-v",
-        "--run-listener=dotty.tools.ContextEscapeDetector"
-      ),
+      repl := runCompilerMain(repl = true).evaluated
 
       /* Add the sources of scalajs-ir.
        * To guarantee that dotty can bootstrap without depending on a version
@@ -584,59 +634,7 @@ object Build {
       //    IO.unzip(scalaJSIRSourcesJar, trgDir)
       //    (trgDir ** "*.scala").get.toSet
       //  } (Set(scalaJSIRSourcesJar)).toSeq
-      //}.taskValue,
-
-      // Spawn new JVM in run and test
-      fork in run := true,
-      fork in Test := true,
-      parallelExecution in Test := false,
-
-      // Add git-hash used to package the distribution to the manifest to know it in runtime and report it in REPL
-      packageOptions += ManifestAttributes(("Git-Hash", VersionUtil.gitHash)),
-
-      // http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala
-      // packageAll should always be run before tests
-      javaOptions ++= {
-        val attList = (dependencyClasspath in Runtime).value
-        val pA = packageAll.value
-
-        // put needed dependencies on classpath:
-        val path = for {
-          file <- attList.map(_.data)
-          path = file.getAbsolutePath
-          // FIXME: when we snip the cord, this should go bye-bye
-          if path.contains("scala-library") ||
-            // FIXME: currently needed for tests referencing scalac internals
-            path.contains("scala-reflect") ||
-            // FIXME: should go away when xml literal parsing is removed
-            path.contains("scala-xml") ||
-            // used for tests that compile dotty
-            path.contains("scala-asm") ||
-            // needed for the xsbti interface
-            path.contains("sbt-interface")
-        } yield "-Xbootclasspath/p:" + path
-
-        val ci_build = // propagate if this is a ci build
-          if (sys.props.isDefinedAt(JENKINS_BUILD))
-            List(s"-D$JENKINS_BUILD=${sys.props(JENKINS_BUILD)}") ::: jenkinsMemLimit
-          else if (sys.props.isDefinedAt(DRONE_MEM))
-            List("-Xmx" + sys.props(DRONE_MEM))
-          else List()
-
-        val tuning =
-          if (sys.props.isDefinedAt("Oshort"))
-            // Optimize for short-running applications, see https://github.com/lampepfl/dotty/issues/222
-            List("-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1")
-          else List()
-
-        val jars = List(
-          "-Ddotty.tests.classes.interfaces=" + pA("dotty-interfaces"),
-          "-Ddotty.tests.classes.library=" + pA("dotty-library"),
-          "-Ddotty.tests.classes.compiler=" + pA("dotty-compiler")
-        )
-
-        jars ::: tuning ::: agentOptions ::: ci_build ::: path.toList
-      }
+      //}.taskValue
   )
 
   def runCompilerMain(repl: Boolean = false) = Def.inputTaskDyn {
@@ -678,7 +676,7 @@ object Build {
         "dotty-compiler" -> (packageBin in Compile).value,
         "dotty-library" -> (packageBin in (`dotty-library`, Compile)).value,
         "dotty-compiler-test" -> (packageBin in Test).value
-      ) map { case (k, v) => (k, v.getAbsolutePath) }
+      ).mapValues(_.getAbsolutePath)
     }
   )
 
@@ -706,10 +704,7 @@ object Build {
 
   // Settings shared between dotty-library and dotty-library-bootstrapped
   lazy val dottyLibrarySettings = Seq(
-      libraryDependencies ++= Seq(
-        "org.scala-lang" % "scala-library" % scalacVersion,
-        "com.novocode" % "junit-interface" % "0.11" % "test"
-      )
+      libraryDependencies += "org.scala-lang" % "scala-library" % scalacVersion
   )
 
   lazy val `dotty-library` = project.in(file("library")).asDottyLibrary(NonBootstrapped)
