remove unused code; eliminate quotes in eval expression

Author: philwalk

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

@@ -25,9 +25,11 @@ class ExpressionTest:
     assert(result.contains(expected), s"expression [$expression] did not send [$expected] to stdout")
 
   @Test def verifyImports: Unit =
+
     val expressionLines = List(
       "import java.nio.file.Paths",
-      s"""println(Paths.get("\""."\"").toFile.listFiles.toList.filter(_.isDirectory).size)""",
+      "import dotty.tools.dotc.config.Properties.userDir",
+      s"""println(Paths.get(userDir).toFile.listFiles.toList.filter(_.isDirectory).size)""",
     )
     val expression = expressionLines.mkString(";")
     val success = testExpression(expression){ result =>
@@ -36,8 +38,7 @@ class ExpressionTest:
     assert(success)
 
   def getResult(expression: String): String =
-    val cmd = s"bin/scala -e $expression"
-    val (_, _, stdout, stderr) = bashCommand(s"""bin/scala -e '$expression'""")
+    val (_, _, stdout, stderr) = bashCommand(s"$scalaPath -e '$expression'")
     printf("stdout: %s\n", stdout.mkString("|"))
     printf("stderr: %s\n", stderr.mkString("\n","\n",""))
     stdout.filter(_.nonEmpty).mkString("")

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

@@ -21,13 +21,14 @@ object ScriptTestEnv {
   def psep: String = sys.props("path.separator")
   def userDir: String = sys.props("user.dir").norm
   def testCwd = envOrElse("TEST_CWD", "").norm // optional working directory TEST_CWD
+  def verbose = envOrElse("VERBOSE", "").nonEmpty
 
   def whichJava: String = whichExe("java")
   def whichBash: String = whichExe("bash")
 
   lazy val workingDirectory: String = {
     val dirstr = if testCwd.nonEmpty then
-      printf("TEST_CWD set to [%s]\n", testCwd)
+      if verbose then printf("TEST_CWD set to [%s]\n", testCwd)
       testCwd
     else 
       userDir // userDir, if TEST_CWD not set
@@ -37,7 +38,7 @@ object ScriptTestEnv {
     if !test.isDirectory then
       printf("warning: not found below working directory: %s\n", test.norm)
 
-    printf("working directory is [%s]\n", dirstr)
+    if verbose then printf("working directory is [%s]\n", dirstr)
     dirstr
   }
 
@@ -106,7 +107,7 @@ object ScriptTestEnv {
       // a misconfigured environment (e.g., script is not executable) can prevent script execution
       val validTest = !stderr.exists(_.contains("Permission denied"))
       if ! validTest then
-        printf("\nunable to execute script, return value is %d\n", exitVal)
+        System.err.printf("\nunable to execute script, return value is %d\n", exitVal)
         stderr.foreach { System.err.printf("stderr [%s]\n", _) }
 
       (validTest, exitVal, stdout.reverse, stderr.reverse)
@@ -275,8 +276,7 @@ object ScriptTestEnv {
       ("MSYS", msyshome),
       ("SHELLOPTS", shellopts),
     ).filter { case (name, valu) => valu.nonEmpty }
-    for (k, v) <- pairs do
-      printf("%s : %s\n", k ,v)
+    if verbose then for (k, v) <- pairs do printf("%s : %s\n", k ,v)
     pairs
   }