replace SCALAC_ECHO_TEST scalac modification; test modified copy of scalac

Author: philwalk

compiler/test/dotty/tools/scripting/ClasspathTests.scala

@@ -10,15 +10,14 @@ import org.junit.Test
 import vulpix.TestConfiguration
 
 import scala.sys.process._
+import scala.jdk.CollectionConverters._
 import dotty.tools.dotc.config.Properties._
 
 /** Runs all tests contained in `compiler/test-resources/scripting/` */
 class ClasspathTests:
-  extension (str: String) def dropExtension =
-    str.reverse.dropWhile(_ != '.').drop(1).reverse
-
-  extension(f: File) def absPath =
-    f.getAbsolutePath.replace('\\', '/')
+  val packBinDir = "dist/target/pack/bin"
+  val scalaCopy = makeTestableScriptCopy("scala")
+  val scalacCopy = makeTestableScriptCopy("scalac")
 
   // only interested in classpath test scripts
   def testFiles = scripts("/scripting").filter { _.getName.matches("classpath.*[.]sc") }
@@ -27,9 +26,24 @@ class ClasspathTests:
     case None => sys.error(s"test script not found: ${testScriptName}")
     case Some(file) => file
 
-  def packBinScalaExists:Boolean =
-    val scalaScriptPath = Paths.get("dist/target/pack/bin/scala")
-    scalaScriptPath.toFile.exists
+  def getScriptPath(scriptName: String): Path = Paths.get(s"$packBinDir/$scriptName")
+
+  def exists(scriptPath: Path): Boolean = Files.exists(scriptPath)
+  def packBinScalaExists:Boolean = exists(Paths.get(s"$packBinDir/scala"))
+
+  // create edited copy of [dist/bin/scala] and [dist/bin/scalac] for scalacEchoTest
+  def makeTestableScriptCopy(scriptName: String): Path =
+    val scriptPath: Path = getScriptPath(scriptName)
+    val scriptCopy: Path = getScriptPath(s"$scriptName-copy")
+    if Files.exists(scriptPath) then
+      val lines = Files.readAllLines(scriptPath).asScala.map {
+        _.replaceAll("/scalac", "/scalac-copy").
+        replaceFirst("^eval(.*JAVACMD.*)", "echo $1")
+      }
+      val bytes = (lines.mkString("\n")+"\n").getBytes
+      Files.write(scriptCopy, bytes)
+
+    scriptCopy
 
   /*
    * verify java command line generated by scalac.
@@ -40,8 +54,8 @@ class ClasspathTests:
     printf("bash is [%s]\n", bashExe)
 
     if packBinScalaExists then
-      val echoTest = "SCALAC_ECHO_TEST=1"
-      val bashCmdline = s"SCALA_OPTS= $echoTest dist/target/pack/bin/scala -classpath '$wildcardEntry' $relpath"
+      val echoTest = "" // "SCALAC_ECHO_TEST=1"
+      val bashCmdline = s"SCALA_OPTS= $echoTest ${scalaCopy.norm} -classpath '$wildcardEntry' $relpath"
 
       // ask [dist/bin/scalac] to echo generated command line so we can verify some things
       val cmd = Array(bashExe, "-c", bashCmdline)
@@ -58,7 +72,10 @@ class ClasspathTests:
       def consumeNext = if output.isEmpty then "" else output.dequeue()
 
       // assert that we found "dotty.tools.scripting.Main"
-      assert(consumeNext == "dotty.tools.scripting.Main")
+      val str = consumeNext
+      if str != "dotty.tools.scripting.Main" then
+        
+      assert(str == "dotty.tools.scripting.Main", s"found [$str]")
       val mainArgs = output.copyToArray(Array.ofDim[String](output.length))
 
       // display command line starting with "dotty.tools.scripting.Main"
@@ -203,3 +220,9 @@ extension(path: String)
   def isAbsolute = path.norm.startsWith("/") || (isWin && path.secondChar == ":")
   def secondChar: String = path.take(2).drop(1).mkString("")
 
+extension (str: String) def dropExtension =
+  str.reverse.dropWhile(_ != '.').drop(1).reverse
+
+//extension(f: File) def absPath =
+//f.getAbsolutePath.replace('\\', '/')
+

dist/bin/scalac

@@ -120,8 +120,7 @@ if [ "$PROG_NAME" == "$ScriptingMain" ]; then
   scripting_string="-script $target_script ${scripting_args[@]}"
 fi
 
-EVAL=eval ; [ -n "$SCALAC_ECHO_TEST" ] && EVAL=echo
-$EVAL "\"$JAVACMD\"" \
+eval "\"$JAVACMD\"" \
      ${JAVA_OPTS:-$default_java_opts} \
      "${DEBUG-}" \
      "${java_args[@]}" \