Only use stdlib-bootstrapped-tasty to bootstrapped tests

Author: nicolasstucki

compiler/test/dotty/Properties.scala

@@ -83,7 +83,7 @@ object Properties {
   def scalaLibrary: String = sys.props("dotty.tests.classes.scalaLibrary")
 
   /** scala-library TASTy jar */
-  def scalaLibraryTasty: String = sys.props("dotty.tests.tasties.scalaLibrary")
+  def scalaLibraryTasty: Option[String] = sys.props.get("dotty.tests.tasties.scalaLibrary")
 
   /** scala-asm jar */
   def scalaAsm: String = sys.props("dotty.tests.classes.scalaAsm")

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

@@ -25,14 +25,14 @@ object TestConfiguration {
     "-Xverify-signatures"
   )
 
-  val basicClasspath = mkClasspath(List(
-    Properties.scalaLibraryTasty,
+  val basicClasspath = mkClasspath(
+    Properties.scalaLibraryTasty.toList ::: List(
     Properties.scalaLibrary,
     Properties.dottyLibrary
   ))
 
-  val withCompilerClasspath = mkClasspath(List(
-    Properties.scalaLibraryTasty,
+  val withCompilerClasspath = mkClasspath(
+    Properties.scalaLibraryTasty.toList ::: List(
     Properties.scalaLibrary,
     Properties.scalaAsm,
     Properties.jlineTerminal,

project/Build.scala

@@ -641,11 +641,11 @@ object Build {
           "-Ddotty.tests.classes.tastyCore=" + jars("tasty-core"),
           "-Ddotty.tests.classes.compilerInterface=" + findArtifactPath(externalDeps, "compiler-interface"),
           "-Ddotty.tests.classes.scalaLibrary=" + findArtifactPath(externalDeps, "scala-library"),
-          "-Ddotty.tests.tasties.scalaLibrary=" + jars("scala2-library-tasty"),
           "-Ddotty.tests.classes.scalaAsm=" + findArtifactPath(externalDeps, "scala-asm"),
           "-Ddotty.tests.classes.jlineTerminal=" + findArtifactPath(externalDeps, "jline-terminal"),
           "-Ddotty.tests.classes.jlineReader=" + findArtifactPath(externalDeps, "jline-reader"),
-        )
+        ) ++
+          jars.get("stdlib-bootstrapped-tasty").map("-Ddotty.tests.tasties.scalaLibrary=" + _)
       },
 
       javaOptions ++= Seq(
@@ -831,7 +831,6 @@ object Build {
           // library on the compiler classpath since the non-bootstrapped one
           // may not be binary-compatible.
           "scala3-library"       -> (`scala3-library-bootstrapped` / Compile / packageBin).value,
-          "scala2-library-tasty" -> (`scala2-library-tasty` / Compile / packageBin).value,
         ).mapValues(_.getAbsolutePath)
       }
     }.value,