Keep test and partest as separate sbt targets

Author: vsalvis

.gitignore

@@ -27,4 +27,5 @@ classes/
 /.worksheet/
 
 # Partest
-tests/partest-generated/
+tests/partest-generated/
+tests/runPartest.flag

project/Build.scala

@@ -48,11 +48,12 @@ object DottyBuild extends Build {
     incOptions := incOptions.value.withNameHashing(true),
 
     // enable verbose exception messages for JUnit
-    // JUnit from sbt only generates partest files, doesn't run tests
-    testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v", "--run-listener=test.ContextEscapeDetector",
-      "--exclude-categories=dotty.partest." + (if (isTravisBuild) "" else "Non") + "PartestTarget"),
-    // test generates files, then we run partest
-    partest <<= runTask(Test, "dotty.partest.DPConsoleRunner", "") dependsOn (test in Test),
+    testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "-a", "-v", "--run-listener=test.ContextEscapeDetector"),
+    // when this file is present, running test generates the files for partest
+    // otherwise it just executes the tests directly
+    createPartestFile := { new java.io.File("./tests", "runPartest.flag").createNewFile },
+    runPartestRunner <<= runTask(Test, "dotty.partest.DPConsoleRunner", "") dependsOn (test in Test),
+    deletePartestFile := { new java.io.File("./tests", "runPartest.flag").delete },
 
     // Adjust classpath for running dotty
     mainClass in (Compile, run) := Some("dotty.tools.dotc.Main"),
@@ -83,9 +84,7 @@ object DottyBuild extends Build {
 
       tuning ::: agentOptions ::: travis_build ::: fullpath
     }
-  ) ++ (if (isTravisBuild) Seq() else addCommandAlias("test", "partest"))
-  // alias so that "sbt test" executes partest (which dependsOn test) - no
-  // circular dependency because the setting is evaluated before
+  ) ++ addCommandAlias("partest", ";createPartestFile;runPartestRunner;deletePartestFile")
 
   lazy val dotty = Project(id = "dotty", base = file("."), settings = defaults)
 
@@ -134,5 +133,8 @@ object DottyBuild extends Build {
   lazy val benchmarks = Project(id = "dotty-bench", settings = benchmarkSettings,
     base = file("bench")) dependsOn(dotty % "compile->test")
 
-  lazy val partest = TaskKey[Unit]("partest", "Runs test and partests")
+  lazy val createPartestFile = TaskKey[Unit]("createPartestFile", "Creates the tests/runPartest.flag file")
+  lazy val runPartestRunner = TaskKey[Unit]("runPartestRunner", "Runs partests")
+  lazy val deletePartestFile = TaskKey[Unit]("deletePartestFile", "Deletes the tests/runPartest.flag file")
+
 }

test/dotc/comptest.scala

@@ -4,6 +4,9 @@ import test._
 
 object comptest extends CompilerTest {
 
+  override val generatePartestFiles = false
+  val defaultOutputDir: String = ""
+
   val posDir = "./tests/pos/"
   val negDir = "./tests/neg/"
   val dotcDir = "./src/dotty/"

test/dotc/tests.scala

@@ -6,10 +6,7 @@ import org.junit.Test
 import org.junit.experimental.categories._
 
 
-object TestOptions {
-  val outputDir     = "./out/"
-  val testsDir      = "./tests/"
-  val posDir        = testsDir + "pos/"  
+class tests extends CompilerTest {
 
   val noCheckOptions = List(
 //        "-verbose",
@@ -19,20 +16,13 @@ object TestOptions {
 //        "-Yshow-suppressed-errors",
         "-pagewidth", "160")
 
+  val defaultOutputDir = "./out/"
+
   implicit val defaultOptions = noCheckOptions ++ List(
       "-Yno-deep-subtypes", "-Yno-double-bindings",
       "-Ycheck:tailrec,resolveSuper,mixin,restoreScopes",
-      "-d", outputDir
+      "-d", defaultOutputDir
   )
-}
-
-// Always use this annotation together with a subclass of the test that mixes
-// in PartestVersion (see below). This allows the tests to be run by partest
-// instead of JUnit when using sbt test.
-@Category(Array(classOf[NonPartestTarget])) 
-class tests extends CompilerTest {
-  import TestOptions._
-
   val doEmitBytecode = List("-Ystop-before:terminal")
   val failedbyName = List("-Ystop-before:collectEntryPoints") // #288
   val testPickling = List("-Xprint-types", "-Ytest-pickler", "-Ystop-after:pickler")
@@ -44,6 +34,8 @@ class tests extends CompilerTest {
   val allowDeepSubtypes = defaultOptions diff List("-Yno-deep-subtypes")
   val allowDoubleBindings = defaultOptions diff List("-Yno-double-bindings")
 
+  val testsDir      = "./tests/"
+  val posDir        = testsDir + "pos/"  
   val posSpecialDir = testsDir + "pos-special/"
   val negDir        = testsDir + "neg/"
   val newDir        = testsDir + "new/"
@@ -204,18 +196,3 @@ class tests extends CompilerTest {
 
   //@Test def dotc_compilercommand = compileFile(dotcDir + "config/", "CompilerCommand")
 }
-
-
-// Always mix in the PartestVersion trait when the superclass is annotated as
-// above. Both together allow the tests to be run by partest instead of JUnit
-// when using sbt test.
-@Category(Array(classOf[PartestTarget])) 
-class testsPartest extends tests with DPCompilerTest {
-  // redirect class file output to partest-generated/kind/testname-kind.obj/
-  override val defaultOutputDir = TestOptions.outputDir
-}
-
-object testsNotPartestable extends CompilerTest {
-  import TestOptions._
-  // Add tests here that should always be run by JUnit, not partest
-}