Run test takes java args

Uses `// java:` syntax as a stopgap.
Args are appended to child message line.

Author: som-snytt

compiler/test/dotty/tools/utils.scala

@@ -12,10 +12,10 @@ import scala.io.Source
 import scala.jdk.StreamConverters._
 import scala.reflect.ClassTag
 import scala.util.Using.resource
-import scala.util.chaining.given
 import scala.util.control.{ControlThrowable, NonFatal}
 
 import dotc.config.CommandLineParser
+import dotc.util.chaining.*
 
 object Dummy
 
@@ -76,7 +76,11 @@ object ToolName:
   def named(s: String): ToolName = values.find(_.toString.equalsIgnoreCase(s)).getOrElse(throw IllegalArgumentException(s))
 
 type ToolArgs = Map[ToolName, List[String]]
+object ToolArgs:
+  def empty = Map.empty[ToolName, List[String]]
 type PlatformFiles = Map[TestPlatform, List[String]]
+object PlatformFiles:
+  def empty = Map.empty[TestPlatform, List[String]]
 
 /** Take a prefix of each file, extract tool args, parse, and combine.
  *  Arg parsing respects quotation marks. Result is a map from ToolName to the combined tokens.
@@ -90,21 +94,23 @@ def toolArgsFor(files: List[JPath], charset: Charset = UTF_8): ToolArgs =
  *  If the ToolName is Target, then also accumulate the file name associated with the given platform.
  */
 def platformAndToolArgsFor(files: List[JPath], charset: Charset = UTF_8): (PlatformFiles, ToolArgs) =
-  files.foldLeft(Map.empty[TestPlatform, List[String]] -> Map.empty[ToolName, List[String]]) { (res, path) =>
+  files.foldLeft((PlatformFiles.empty, ToolArgs.empty)) { (res, path) =>
     val toolargs = toolArgsParse(resource(Files.lines(path, charset))(_.limit(10).toScala(List)), Some(path.toString))
     toolargs.foldLeft(res) {
-      case ((plat, acc), (tool, args)) =>
+      case ((plats, tools), (tool, args)) =>
         val name = ToolName.named(tool)
         val tokens = CommandLineParser.tokenize(args)
 
-        val plat1 = if name eq ToolName.Target then
+        val plats1 = if name eq ToolName.Target then
           val testPlatform = TestPlatform.named(tokens.head)
           val fileName = path.toString
-          plat.updatedWith(testPlatform)(_.map(fileName :: _).orElse(Some(fileName :: Nil)))
+          plats.updatedWith(testPlatform)(_.map(fileName :: _).orElse(Some(fileName :: Nil)))
         else
-          plat
+          plats
 
-        plat1 -> acc.updatedWith(name)(v0 => v0.map(_ ++ tokens).orElse(Some(tokens)))
+        val tools1 = tools.updatedWith(name)(v0 => v0.map(_ ++ tokens).orElse(Some(tokens)))
+
+        (plats1, tools1)
     }
   }
 
@@ -131,19 +137,18 @@ private val directiveUnknown = raw"//> using (.*)".r.unanchored
 // If args string ends in close comment, stop at the `*` `/`.
 // Returns all the matches by the regex.
 def toolArgsParse(lines: List[String], filename: Option[String]): List[(String,String)] =
-  lines.flatMap {
+  lines.flatMap:
     case toolArg("scalac", _) => sys.error(s"`// scalac: args` not supported. Please use `//> using options args`${filename.fold("")(f => s" in file $f")}")
     case toolArg("javac", _) => sys.error(s"`// javac: args` not supported. Please use `//> using javacOpt args`${filename.fold("")(f => s" in file $f")}")
     case toolArg(name, args) => List((name, args))
     case _ => Nil
-  } ++
-  lines.flatMap {
+  ++
+  lines.flatMap:
     case directiveOptionsArg(args) => List(("scalac", args))
     case directiveJavacOptions(args) => List(("javac", args))
     case directiveTargetOptions(platform) => List(("target", platform))
     case directiveUnknown(rest) => sys.error(s"Unknown directive: `//> using ${CommandLineParser.tokenize(rest).headOption.getOrElse("''")}`${filename.fold("")(f => s" in file $f")}")
     case _ => Nil
-  }
 
 import org.junit.Test
 import org.junit.Assert._

compiler/test/dotty/tools/vulpix/ChildJVMMain.java

@@ -12,10 +12,15 @@ public class ChildJVMMain {
     static final String MessageStart = "##THIS IS THE START FOR ME, HELLO##";
     static final String MessageEnd = "##THIS IS THE END FOR ME, GOODBYE##";
 
-    private static void runMain(String dir) throws Exception {
+    private static void runMain(String line) throws Exception {
         Method meth = null;
-        Object[] args = new Object[]{ new String[]{ } };
+        String[] args = new String[]{ };
         try {
+	    String[] tokens = line.split("\\s+", 2);
+	    String dir = tokens[0];
+	    if (tokens.length > 1) {
+	      args = tokens[1].split("\\s+");
+	    }
             String jcp = System.getProperty("java.class.path");
             String sep = File.pathSeparator;
             System.setProperty("java.class.path", jcp == null ? dir : dir + sep + jcp);
@@ -37,15 +42,15 @@ private static void runMain(String dir) throws Exception {
         }
         System.out.println(MessageStart);
 
-        meth.invoke(null, args);
+        meth.invoke(null, new Object[] { args });
     }
 
     public static void main(String[] args) throws Exception {
-      BufferedReader stdin = new BufferedReader(new InputStreamReader(System.in));
+        BufferedReader stdin = new BufferedReader(new InputStreamReader(System.in));
 
-      while (true) {
-          runMain(stdin.readLine());
-          System.out.println(MessageEnd);
-      }
+        while (true) {
+            runMain(stdin.readLine());
+            System.out.println(MessageEnd);
+        }
     }
 }

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

@@ -53,7 +53,7 @@ trait RunnerOrchestration {
 
   /** Running a `Test` class's main method from the specified `classpath` */
   def runMain(classPath: String, toolArgs: ToolArgs)(implicit summaryReport: SummaryReporting): Status =
-    monitor.runMain(classPath)
+    monitor.runMain(classPath, toolArgs.getOrElse(ToolName.Java, Nil))
 
   /** Each method of Debuggee can be called only once, in the order of definition.*/
   trait Debuggee:
@@ -86,8 +86,8 @@ trait RunnerOrchestration {
    */
   private class RunnerMonitor {
 
-    def runMain(classPath: String)(implicit summaryReport: SummaryReporting): Status =
-      withRunner(_.runMain(classPath))
+    def runMain(classPath: String, args: List[String])(implicit summaryReport: SummaryReporting): Status =
+      withRunner(_.runMain(classPath, args))
 
     def debugMain(classPath: String)(f: Debuggee => Unit)(implicit summaryReport: SummaryReporting): Unit =
       withRunner(_.debugMain(classPath)(f))
@@ -132,17 +132,17 @@ trait RunnerOrchestration {
         process = null
 
       /** Blocks less than `maxDuration` while running `Test.main` from `dir` */
-      def runMain(classPath: String): Status =
+      def runMain(classPath: String, args: List[String]): Status =
         assert(process ne null, "Runner was killed and then reused without setting a new process")
-        awaitStatusOrRespawn(startMain(classPath))
+        awaitStatusOrRespawn(startMain(classPath, args))
 
       def debugMain(classPath: String)(f: Debuggee => Unit): Unit =
         assert(process ne null, "Runner was killed and then reused without setting a new process")
 
         val debuggee = new Debuggee:
           private var mainFuture: Future[Status] = null
           def readJdiPort(): Int = process.getJdiPort()
-          def launch(): Unit = mainFuture = startMain(classPath)
+          def launch(): Unit = mainFuture = startMain(classPath, Nil)
           def exit(): Status =
             awaitStatusOrRespawn(mainFuture)
 
@@ -153,9 +153,10 @@ trait RunnerOrchestration {
           throw e
       end debugMain
 
-      private def startMain(classPath: String): Future[Status] =
+      private def startMain(classPath: String, args: List[String]): Future[Status] =
+        val line = if args.isEmpty then classPath else s"$classPath ${args.mkString(" ")}"
         // pass classpath to running process
-        process.printLine(classPath)
+        process.printLine(line)
 
         // Create a future reading the object:
         Future:

tests/run/Pouring.check

@@ -1 +1,2 @@
-Illegal command line: more arguments expected
+Moves: Vector(Empty(0), Empty(1), Fill(0), Fill(1), Pour(0,1), Pour(1,0))
+Solution: Some(Fill(1) Pour(1,0) Empty(0) Pour(1,0) Fill(1) Pour(1,0) --> Vector(4, 6))

tests/run/Pouring.scala

@@ -1,3 +1,5 @@
+// java: 6 4 7
+
 type Glass = Int
 type Levels = Vector[Int]