Add Scala Native support for running a main method from the test scope

Author: Gedochao

modules/build/src/test/scala/scala/build/tests/TestInputs.scala

@@ -66,14 +66,27 @@ final case class TestInputs(
     buildThreads: BuildThreads, // actually only used when bloopConfigOpt is non-empty
     bloopConfigOpt: Option[BloopRifleConfig],
     fromDirectory: Boolean = false
-  )(f: (os.Path, Inputs, Build) => T) =
+  )(f: (os.Path, Inputs, Build) => T): T =
     withBuild(options, buildThreads, bloopConfigOpt, fromDirectory)((p, i, maybeBuild) =>
       maybeBuild match {
         case Left(e)  => throw e
         case Right(b) => f(p, i, b)
       }
     )
 
+  def withLoadedBuilds[T](
+    options: BuildOptions,
+    buildThreads: BuildThreads, // actually only used when bloopConfigOpt is non-empty
+    bloopConfigOpt: Option[BloopRifleConfig],
+    fromDirectory: Boolean = false
+  )(f: (os.Path, Inputs, Builds) => T) =
+    withBuilds(options, buildThreads, bloopConfigOpt, fromDirectory)((p, i, builds) =>
+      builds match {
+        case Left(e)  => throw e
+        case Right(b) => f(p, i, b)
+      }
+    )
+
   def withBuilds[T](
     options: BuildOptions,
     buildThreads: BuildThreads, // actually only used when bloopConfigOpt is non-empty

modules/cli/src/main/scala/scala/cli/commands/package0/Package.scala

@@ -393,7 +393,7 @@ object Package extends ScalaCommand[PackageOptions] with BuildCommandHelpers {
               case _           => None
 
           val cachedDest = value(buildNative(
-            build = build,
+            builds = Seq(build),
             mainClass = mainClassO,
             targetType = tpe,
             destPath = Some(destPath),
@@ -535,10 +535,10 @@ object Package extends ScalaCommand[PackageOptions] with BuildCommandHelpers {
     val dest    = workDir / "doc.jar"
     val cacheData =
       CachedBinary.getCacheData(
-        build,
-        extraArgs.toList,
-        dest,
-        workDir
+        builds = Seq(build),
+        config = extraArgs.toList,
+        dest = dest,
+        workDir = workDir
       )
 
     if (cacheData.changed) {
@@ -667,7 +667,7 @@ object Package extends ScalaCommand[PackageOptions] with BuildCommandHelpers {
       case Platform.Native =>
         val dest =
           value(buildNative(
-            build = build,
+            builds = Seq(build),
             mainClass = Some(mainClass),
             targetType = PackageType.Native.Application,
             destPath = None,
@@ -1031,28 +1031,29 @@ object Package extends ScalaCommand[PackageOptions] with BuildCommandHelpers {
   }
 
   def buildNative(
-    build: Build.Successful,
+    builds: Seq[Build.Successful],
     mainClass: Option[String], // when building a static/dynamic library, we don't need a main class
     targetType: PackageType.Native,
     destPath: Option[os.Path],
     logger: Logger
   ): Either[BuildException, os.Path] = either {
-    val dest = build.inputs.nativeWorkDir / s"main${if (Properties.isWin) ".exe" else ""}"
+    val dest = builds.head.inputs.nativeWorkDir / s"main${if (Properties.isWin) ".exe" else ""}"
 
     val cliOptions =
-      build.options.scalaNativeOptions.configCliOptions(build.sources.resourceDirs.nonEmpty)
+      builds.head.options.scalaNativeOptions.configCliOptions(builds.exists(
+        _.sources.resourceDirs.nonEmpty
+      ))
 
-    val setupPython = build.options.notForBloopOptions.doSetupPython.getOrElse(false)
+    val setupPython = builds.head.options.notForBloopOptions.doSetupPython.getOrElse(false)
     val pythonLdFlags =
-      if (setupPython)
+      if setupPython then
         value {
           val python       = Python()
           val flagsOrError = python.ldflags
           logger.debug(s"Python ldflags: $flagsOrError")
           flagsOrError.orPythonDetectionError
         }
-      else
-        Nil
+      else Nil
     val pythonCliOptions = pythonLdFlags.flatMap(f => Seq("--linking-option", f)).toList
 
     val libraryLinkingOptions: Seq[String] =
@@ -1076,21 +1077,21 @@ object Package extends ScalaCommand[PackageOptions] with BuildCommandHelpers {
       libraryLinkingOptions ++
       mainClass.toSeq.flatMap(m => Seq("--main", m))
 
-    val nativeWorkDir = build.inputs.nativeWorkDir
+    val nativeWorkDir = builds.head.inputs.nativeWorkDir
     os.makeDir.all(nativeWorkDir)
 
     val cacheData =
       CachedBinary.getCacheData(
-        build,
+        builds,
         allCliOptions,
         dest,
         nativeWorkDir
       )
 
     if (cacheData.changed) {
-      NativeResourceMapper.copyCFilesToScalaNativeDir(build, nativeWorkDir)
-      val mainJar   = Library.libraryJar(build)
-      val classpath = mainJar.toString +: build.artifacts.classPath.map(_.toString)
+      builds.foreach(build => NativeResourceMapper.copyCFilesToScalaNativeDir(build, nativeWorkDir))
+      val jars      = builds.map(Library.libraryJar(_))
+      val classpath = (jars ++ builds.flatMap(_.artifacts.classPath)).map(_.toString).distinct
       val args =
         allCliOptions ++
           logger.scalaNativeCliInternalLoggerOptions ++
@@ -1101,25 +1102,24 @@ object Package extends ScalaCommand[PackageOptions] with BuildCommandHelpers {
             nativeWorkDir.toString()
           ) ++ classpath
 
-      val scalaNativeCli = build.artifacts.scalaOpt
+      val scalaNativeCli = builds.flatMap(_.artifacts.scalaOpt).headOption
         .getOrElse {
           sys.error("Expected Scala artifacts to be fetched")
         }
         .scalaNativeCli
 
       val exitCode =
         Runner.runJvm(
-          build.options.javaHome().value.javaCommand,
-          build.options.javaOptions.javaOpts.toSeq.map(_.value.value),
+          builds.head.options.javaHome().value.javaCommand,
+          builds.head.options.javaOptions.javaOpts.toSeq.map(_.value.value),
           scalaNativeCli,
           "scala.scalanative.cli.ScalaNativeLd",
           args,
           logger
         ).waitFor()
-      if (exitCode == 0)
+      if exitCode == 0 then
         CachedBinary.updateProjectAndOutputSha(dest, nativeWorkDir, cacheData.projectSha)
-      else
-        throw new ScalaNativeBuildError
+      else throw new ScalaNativeBuildError
     }
 
     dest

modules/cli/src/main/scala/scala/cli/commands/run/Run.scala

@@ -543,7 +543,7 @@ object Run extends ScalaCommand[RunOptions] with BuildCommandHelpers {
           pythonExecutable.fold(Map.empty)(py => Map("SCALAPY_PYTHON_PROGRAMNAME" -> py))
         val extraEnv = libraryPathsEnv ++ programNameEnv ++ pythonExtraEnv
         val maybeResult = withNativeLauncher(
-          builds.head, // TODO: support multiple builds
+          builds,
           mainClass,
           logger
         ) { launcher =>
@@ -686,12 +686,12 @@ object Run extends ScalaCommand[RunOptions] with BuildCommandHelpers {
   }
 
   def withNativeLauncher[T](
-    build: Build.Successful,
+    builds: Seq[Build.Successful],
     mainClass: String,
     logger: Logger
   )(f: os.Path => T): Either[BuildException, T] =
     Package.buildNative(
-      build = build,
+      builds = builds,
       mainClass = Some(mainClass),
       targetType = PackageType.Native.Application,
       destPath = None,

modules/cli/src/main/scala/scala/cli/commands/test/Test.scala

@@ -225,7 +225,7 @@ object Test extends ScalaCommand[TestOptions] {
       case Platform.Native =>
         value {
           Run.withNativeLauncher(
-            build,
+            Seq(build),
             "scala.scalanative.testinterface.TestMain",
             logger
           ) { launcher =>

modules/cli/src/main/scala/scala/cli/internal/CachedBinary.scala

@@ -58,13 +58,13 @@ object CachedBinary {
       .map(_.getBytes(StandardCharsets.UTF_8))
   }
 
-  private def projectSha(build: Build.Successful, config: List[String]) = {
+  private def projectSha(builds: Seq[Build.Successful], config: List[String]): String = {
     val md      = MessageDigest.getInstance("SHA-1")
     val charset = StandardCharsets.UTF_8
-    md.update(build.inputs.sourceHash().getBytes(charset))
+    md.update(builds.map(_.inputs.sourceHash()).reduce(_ + _).getBytes(charset))
     md.update("<resources>".getBytes())
     // Resource changes for SN require relinking, so they should also be hashed
-    hashResources(build).foreach(md.update)
+    builds.foreach(build => hashResources(build).foreach(md.update))
     md.update("</resources>".getBytes())
     md.update(0: Byte)
     md.update("<config>".getBytes(charset))
@@ -75,7 +75,7 @@ object CachedBinary {
     md.update("</config>".getBytes(charset))
     md.update(Constants.version.getBytes)
     md.update(0: Byte)
-    for (h <- build.options.hash) {
+    for (h <- builds.map(_.options).reduce(_ orElse _).hash) {
       md.update(h.getBytes(charset))
       md.update(0: Byte)
     }
@@ -99,19 +99,20 @@ object CachedBinary {
   }
 
   def getCacheData(
-    build: Build.Successful,
+    builds: Seq[Build.Successful],
     config: List[String],
     dest: os.Path,
     workDir: os.Path
   ): CacheData = {
     val projectShaPath = resolveProjectShaPath(workDir)
     val outputShaPath  = resolveOutputShaPath(workDir)
 
-    val currentProjectSha = projectSha(build, config)
-    val currentOutputSha  = if (os.exists(dest)) Some(fileSha(dest)) else None
+    val currentProjectSha = projectSha(builds, config)
+    val currentOutputSha  = if os.exists(dest) then Some(fileSha(dest)) else None
 
-    val previousProjectSha = if (os.exists(projectShaPath)) Some(os.read(projectShaPath)) else None
-    val previousOutputSha  = if (os.exists(outputShaPath)) Some(os.read(outputShaPath)) else None
+    val previousProjectSha =
+      if os.exists(projectShaPath) then Some(os.read(projectShaPath)) else None
+    val previousOutputSha = if os.exists(outputShaPath) then Some(os.read(outputShaPath)) else None
 
     val changed =
       !previousProjectSha.contains(currentProjectSha) ||

modules/cli/src/main/scala/scala/cli/packaging/Library.scala

@@ -20,7 +20,7 @@ object Library {
     val dest    = workDir / "library.jar"
     val cacheData =
       CachedBinary.getCacheData(
-        build,
+        Seq(build),
         mainClassOpt.toList.flatMap(c => List("--main-class", c)),
         dest,
         workDir

modules/cli/src/main/scala/scala/cli/packaging/NativeImage.scala

@@ -190,7 +190,7 @@ object NativeImage {
       options.notForBloopOptions.packageOptions.nativeImageOptions.graalvmArgs.map(_.value)
 
     val cacheData = CachedBinary.getCacheData(
-      build,
+      Seq(build),
       s"--java-home=${javaHome.javaHome.toString}" :: "--" :: extraOptions.toList ++ nativeImageArgs,
       dest,
       nativeImageWorkDir