Simplify classpath shenanigans

Author: SolalPirelli

compiler/test/dotty/Properties.scala

@@ -63,9 +63,6 @@ object Properties {
   /** dotty-compiler jar */
   def dottyCompiler: String = sys.props("dotty.tests.classes.dottyCompiler")
 
-  /** dotty-repl jar */
-  def dottyRepl: String = sys.props("dotty.tests.classes.dottyRepl")
-
   /** dotty-staging jar */
   def dottyStaging: String = sys.props("dotty.tests.classes.dottyStaging")
 
@@ -96,15 +93,6 @@ object Properties {
   /** jline-reader jar */
   def jlineReader: String = sys.props("dotty.tests.classes.jlineReader")
 
-  /** pprint jar */
-  def pprint: String = sys.props("dotty.tests.classes.pprint")
-
-  /** fansi jar */
-  def fansi: String = sys.props("dotty.tests.classes.fansi")
-
-  /** fansi jar */
-  def sourcecode: String = sys.props("dotty.tests.classes.sourcecode")
-
   /** scalajs-javalib jar */
   def scalaJSJavalib: String = sys.props("dotty.tests.classes.scalaJSJavalib")
 

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

@@ -31,7 +31,7 @@ object TestConfiguration {
 
   val basicClasspath = mkClasspath(List(Properties.scalaLibrary))
 
-  val withCompilerClasspath = mkClasspath(List(
+  lazy val withCompilerClasspath = mkClasspath(List(
     Properties.scalaLibrary,
     Properties.scalaAsm,
     Properties.compilerInterface,
@@ -52,19 +52,6 @@ object TestConfiguration {
     Properties.scalaJSLibrary,
   ))
 
-  lazy val replClassPath =
-    withCompilerClasspath + File.pathSeparator + mkClasspath(List(
-      Properties.dottyRepl,
-      Properties.jlineTerminal,
-      Properties.jlineReader,
-      Properties.fansi,
-      Properties.pprint,
-      Properties.sourcecode
-  ))
-
-  lazy val replWithStagingClasspath = 
-    replClassPath + File.pathSeparator + mkClasspath(List(Properties.dottyStaging))
-
   def mkClasspath(classpaths: List[String]): String =
     classpaths.map({ p =>
       val file = new java.io.File(p)
@@ -80,10 +67,8 @@ object TestConfiguration {
   val noYcheckOptions = TestFlags(basicClasspath, noYcheckCommonOptions)
   val bestEffortBaselineOptions = TestFlags(basicClasspath, noCheckOptions)
   val unindentOptions = TestFlags(basicClasspath, Array("-no-indent") ++ checkOptions ++ noCheckOptions ++ yCheckOptions)
-  val withCompilerOptions =
+  lazy val withCompilerOptions =
     defaultOptions.withClasspath(withCompilerClasspath).withRunClasspath(withCompilerClasspath)
-  lazy val withReplOptions =
-    defaultOptions.withRunClasspath(replClassPath)
   lazy val withStagingOptions =
     defaultOptions.withClasspath(withStagingClasspath).withRunClasspath(withStagingClasspath)
   lazy val withTastyInspectorOptions =
@@ -98,7 +83,7 @@ object TestConfiguration {
     "-Yprint-pos",
     "-Yprint-pos-syms"
   )
-  val picklingWithCompilerOptions =
+  lazy val picklingWithCompilerOptions =
     picklingOptions.withClasspath(withCompilerClasspath).withRunClasspath(withCompilerClasspath)
 
   val explicitNullsOptions = defaultOptions `and` "-Yexplicit-nulls"

project/Build.scala

@@ -1027,35 +1027,8 @@ object Build {
       ),
       // Configure to use the non-bootstrapped compiler
       bootstrappedScalaInstanceSettings,
-      Test / javaOptions ++= {
-        val log = streams.value.log
-        val managedSrcDir = {
-          // Populate the directory
-          (Compile / managedSources).value
-
-          (Compile / sourceManaged).value
-        }
-        val externalDeps = (ThisProject / Runtime / externalDependencyClasspath).value
-        Seq(
-          s"-Ddotty.tests.dottyCompilerManagedSources=${managedSrcDir}",
-          s"-Ddotty.tests.classes.dottyInterfaces=${(`scala3-interfaces` / Compile / packageBin).value}",
-          s"-Ddotty.tests.classes.dottyCompiler=${(`scala3-compiler-bootstrapped` / Compile / packageBin).value}",
-          s"-Ddotty.tests.classes.dottyRepl=${(ThisProject / Compile / packageBin).value}",
-          s"-Ddotty.tests.classes.tastyCore=${(`tasty-core-bootstrapped` / Compile / packageBin).value}",
-          s"-Ddotty.tests.classes.compilerInterface=${findArtifactPath(externalDeps, "compiler-interface")}",
-          s"-Ddotty.tests.classes.scalaLibrary=${(`scala-library-bootstrapped` / Compile / packageBin).value}",
-          s"-Ddotty.tests.classes.scalaJSScalalib=${(`scala-library-sjs` / Compile / packageBin).value}",
-          s"-Ddotty.tests.classes.scalaAsm=${findArtifactPath(externalDeps, "scala-asm")}",
-          s"-Ddotty.tests.classes.jlineTerminal=${findArtifactPath(externalDeps, "jline-terminal")}",
-          s"-Ddotty.tests.classes.jlineReader=${findArtifactPath(externalDeps, "jline-reader")}",
-          s"-Ddotty.tests.classes.dottyStaging=${(LocalProject("scala3-staging") / Compile / packageBin).value}",
-          s"-Ddotty.tests.classes.dottyTastyInspector=${(LocalProject("scala3-tasty-inspector") / Compile / packageBin).value}",
-          s"-Ddotty.tests.classes.pprint=${findArtifactPath(externalDeps, "pprint_3")}",
-          s"-Ddotty.tests.classes.fansi=${findArtifactPath(externalDeps, "fansi_3")}",
-          s"-Ddotty.tests.classes.sourcecode=${findArtifactPath(externalDeps, "sourcecode_3")}",
-          s"-Ddotty.tools.dotc.semanticdb.test=${(ThisBuild / baseDirectory).value/"tests"/"semanticdb"}",
-        )
-      },
+      // Needed for the JSR223 tests which are "run" tests
+      Test / javaOptions += s"-Ddotty.tests.classes.scalaLibrary=${(`scala-library-bootstrapped` / Compile / packageBin).value}",
       run / fork := true,
       excludeDependencies += "org.scala-lang" %% "scala3-library",
       excludeDependencies += "org.scala-lang" % "scala-library",

repl/test/dotty/tools/repl/JSR223Tests.scala

@@ -14,7 +14,9 @@ final class JSR223Tests:
 
   @Test def filetests: Unit =
     given TestGroup = TestGroup("runWithCompiler")
-    compileFilesInDir("test-resources/jsr223", TestConfiguration.withReplOptions)
+    // We want this test to run with the REPL inside the classpath so it can access the script engine,
+    // and by default Vulpix only gives a restricted class path, so pass the full one
+    compileFilesInDir("test-resources/jsr223", TestConfiguration.defaultOptions.withRunClasspath(System.getProperty("java.class.path")))
       .checkRuns()
   end filetests
 

repl/test/dotty/tools/repl/ReplTest.scala

@@ -123,6 +123,17 @@ extends ReplDriver(options, new PrintStream(out, true, StandardCharsets.UTF_8.na
   }
 
 object ReplTest:
-  val commonOptions = Array("-color:never", "-pagewidth", "80", "-Ydebug")
-  val defaultOptions = commonOptions ++ Array("-classpath", TestConfiguration.replClassPath)
-  lazy val withStagingOptions = commonOptions ++ Array("-classpath", TestConfiguration.replWithStagingClasspath)
+  // Because we test REPL features like completion,
+  // we don't want other test stuff to get in the way,
+  // e.g., "Pred" should complete to "Predef" and not "PredefTest" just because some dependency has a test named like that
+  private val classpath =
+    System.getProperty("java.class.path")
+      .split(JFile.pathSeparator)
+      .filter(!_.contains("test-classes"))
+      .mkString(JFile.pathSeparator)
+
+  def createOptions(extraClasspath: String*): Array[String] =
+    Array("-color:never", "-pagewidth", "80", "-Ydebug",
+          "-classpath", classpath + JFile.pathSeparator + extraClasspath.mkString(JFile.pathSeparator))
+
+  val defaultOptions: Array[String] = createOptions()

repl/test/dotty/tools/repl/ShadowingTests.scala

@@ -25,9 +25,11 @@ import vulpix.{TestConfiguration, TestFlags}
  *  and running scripted REPL tests with them on the claspath.
  */
 object ShadowingTests:
-  def classpath = TestConfiguration.replClassPath + File.pathSeparator + shadowDir
-  def options = ReplTest.commonOptions ++ Array("-classpath", classpath)
+  // The directory on the classpath containing artifacts to be shadowed
+  private var dir: Path = null
+
   def shadowDir = dir.toAbsolutePath.toString
+  def options = ReplTest.createOptions(shadowDir)
 
   def createSubDir(name: String): Path =
     val subdir = dir.resolve(name)
@@ -36,9 +38,6 @@ object ShadowingTests:
       assert(Files.isDirectory(subdir), s"failed to create shadowed subdirectory $subdir")
     subdir
 
-  // The directory on the classpath containing artifacts to be shadowed
-  private var dir: Path = null
-
   @BeforeClass def setupDir: Unit =
     dir = Files.createTempDirectory("repl-shadow")
 

staging/test/scala/quoted/staging/repl/StagingScriptedReplTests.scala

@@ -8,7 +8,7 @@ import org.junit.Test
 import org.junit.experimental.categories.Category
 
 /** Runs all tests contained in `staging/test-resources/repl-staging` */
-class StagingScriptedReplTests extends ReplTest(ReplTest.withStagingOptions) {
+class StagingScriptedReplTests extends ReplTest {
 
   @Category(Array(classOf[BootstrappedOnlyTests]))
   @Test def replStagingTests = scripts("/repl-staging").foreach(testFile)