Replace testFromTasty with testCompilation --from-tasty

Author: nicolasstucki

compiler/test/dotty/tools/vulpix/ParallelTesting.scala

@@ -1391,7 +1391,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
             |Test '$title' compiled with $errors error(s) and $warnings warning(s),
             |the test can be reproduced by running:
             |
-            |  sbt "testFromTasty $file"
+            |  sbt "testCompilation --from-tasty $file"
             |
             |This tests can be disabled by adding `${file.getName}` to `compiler${JFile.separator}test${JFile.separator}dotc${JFile.separator}$runOrPos-$listName.blacklist`
             |

docs/docs/contributing/testing.md

@@ -92,3 +92,15 @@ To run `testCompilation` on a bootstrapped Dotty compiler, use
 `dotty-compiler-bootstrapped/testCompilation` (with the same syntax as above).
 Some tests can only be run in bootstrapped compilers; that includes all tests
 with `with-compiler` in their name.
+
+### From TASTy tests
+
+`testCompilation` has a additional mode to run tests that compile code from a `.tasty` file, decompile a `.tasty` file and recompile the decompiled tasty.
+ Modify blacklist and whitelists in `compiler/test/dotc` to enable or disable tests from `.tasty` files.
+
+ ```bash
+ $ sbt
+ > testCompilation --from-tasty
+ ```
+ 
+ This mode can be combined with `--update-checkfiles` to update the `.decompiled` files or can be run under `dotty-compiler-bootstrapped/testCompilation` to test on a bootstrapped Dotty compiler. 

project/Build.scala

@@ -85,9 +85,6 @@ object Build {
   // Run tests with filter through vulpix test suite
   val testCompilation = inputKey[Unit]("runs integration test with the supplied filter")
 
-  // Run TASTY tests with filter through vulpix test suite
-  val testFromTasty = inputKey[Unit]("runs tasty integration test with the supplied filter")
-
   // Spawns a repl with the correct classpath
   val repl = inputKey[Unit]("run the REPL with correct classpath")
 
@@ -438,16 +435,6 @@ object Build {
     case Bootstrapped => `dotty-doc-bootstrapped`
   }
 
-  def testOnlyFiltered(test: String, options: String) = Def.inputTaskDyn {
-    val args = spaceDelimited("<arg>").parsed
-    val updateCheckfile = args.contains("--update-checkfiles")
-    val args1 = if (updateCheckfile) args.filter(_ != "--update-checkfiles") else args
-    val cmd = s" $test -- $options" +
-      (if (updateCheckfile) " -Ddotty.tests.updateCheckfiles=true" else "") +
-      (if (args1.nonEmpty) " -Ddotty.tests.filter=" + args1.mkString(" ") else "")
-    (testOnly in Test).toTask(cmd)
-  }
-
   def findLib(attList: Seq[Attributed[File]], name: String) = attList
     .map(_.data.getAbsolutePath)
     .find(_.contains(name))
@@ -548,8 +535,17 @@ object Build {
         jarOpts ::: tuning ::: agentOptions ::: ci_build
       },
 
-      testCompilation := testOnlyFiltered("dotty.tools.dotc.*CompilationTests", "--exclude-categories=dotty.SlowTests").evaluated,
-      testFromTasty := testOnlyFiltered("dotty.tools.dotc.FromTastyTests", "").evaluated,
+      testCompilation := Def.inputTaskDyn {
+        val args = spaceDelimited("<arg>").parsed
+        val updateCheckfile = args.contains("--update-checkfiles")
+        val fromTasty = args.contains("--from-tasty")
+        val args1 = if (updateCheckfile | fromTasty) args.filter(x => x != "--update-checkfiles" && x != "--from-tasty") else args
+        val test = if (fromTasty) "dotty.tools.dotc.FromTastyTests" else "dotty.tools.dotc.*CompilationTests"
+        val cmd = s" $test -- --exclude-categories=dotty.SlowTests" +
+          (if (updateCheckfile) " -Ddotty.tests.updateCheckfiles=true" else "") +
+          (if (args1.nonEmpty) " -Ddotty.tests.filter=" + args1.mkString(" ") else "")
+        (testOnly in Test).toTask(cmd)
+      }.evaluated,
 
       dotr := {
         val args: List[String] = spaceDelimited("<arg>").parsed.toList