remove redundant import; extend io/ClasspathTest.scala ; add classpathTest.sc

Author: philwalk

compiler/test-resources/scripting/classpathTest.sc

@@ -0,0 +1,33 @@
+#!dist/target/pack/bin/scala -classpath "dist/target/pack/lib/*"
+!#
+
+/*
+ * a single wildcard -classpath entry is vulnerable to being converted by Windows jdk
+ * to a list of jar files.  To prevent this Windows-only behavior, a semicolon is
+ * added to the classpath entry by dist/bin/scala to prevent globbing.
+ *
+ * The symptom of failure is that args contains lots of jar file paths.
+ */
+import java.nio.file.Paths
+
+// expecting classpath to contain scala compiler lib jars
+def main(args: Array[String]): Unit =
+  assert(args.isEmpty,s"args contains ${args.length} arguments, but was expecting none")
+
+  val expected = Paths.get("dist/target/pack/lib").toFile.listFiles.toList.map { _.getName }.filter { _.endsWith(".jar") }
+  def psep = java.io.File.pathSeparator
+  val classpath = sys.props("java.class.path")
+  val entries = classpath.split(psep).map { Paths.get(_).toFile.getName }
+
+  val expectSet = expected.toSet
+  val entrySet = entries.toSet
+
+  if ((expectSet intersect entrySet).isEmpty) then
+    for entry <- expected do
+      printf("expect:%s\n",entry)
+    for entry <- entries do
+      printf("found:%s\n",entry)
+
+  assert ((expectSet intersect entrySet).nonEmpty, s"expected[${expected.size}] but found [${entries.size}]")
+
+  printf("success!\n")

compiler/test/dotty/tools/io/ClasspathTest.scala

@@ -19,25 +19,43 @@ class ClasspathTest {
   // Verify that Windows users not forced to use backslash in classpath.
   //
   @Test def testWildcards(): Unit =
-    import dotty.tools.io.ClassPath
     val outDir = Files.createTempDirectory("classpath-test")
     try
       val compilerLib = "dist/target/pack/lib"
       val libdir = Paths.get(compilerLib).toFile
       if libdir.exists then
-        try for src <- libdir.listFiles.toList.take(5) do
-          val dest = Paths.get(s"$outDir/${src.getName}")
-          printf("copy: %s\n",Files.copy(src.toPath,dest)) // ,REPLACE_EXISTING,COPY_ATTRIBUTES))
+        val libjarFiles = libdir.listFiles.toList.take(5)
+        try
+          for src <- libjarFiles do
+            val dest = Paths.get(s"$outDir/${src.getName}")
+            printf("copy: %s\n",Files.copy(src.toPath,dest)) // ,REPLACE_EXISTING,COPY_ATTRIBUTES))
+        
+          val cp = Seq(s"$outDir/*","not-a-real-directory/*").mkString(pathsep).replace('\\','/')
+         
+          val libjars = libjarFiles.map { _.getName }.toSet
+
+          // expand wildcard classpath entries, ignoring invalid entries
+          val entries = ClassPath.expandPath(cp).map { Paths.get(_).toFile.getName }
+
+          // require one-to-one matches
+          assert(libjars == entries.toSet)
+
+          printf("%d entries\n",entries.size)
+          printf("%d libjars\n",libjars.size)
+
+          for entry <- libjars do
+            printf("libdir[%s]\n",entry)
+
+          for entry <- entries do
+            printf("expand[%s]\n",entry)
+
+          // verify that expanded classpath has expected jar names
+          for jar <- libjars do
+            assert(entries.contains(jar))
+
         catch
-          case _:NullPointerException => // ignore errors adding jars to outDir
-
-      //outDir.toFile.listFiles.toList.foreach { printf("%s\n",_) }
-      val cp = Seq(s"$compilerLib/*",s"$outDir/*","not-a-real-directory/*").mkString(pathsep).replace('\\','/')
-     
-      // need to expand wildcard classpath entries
-      val entries = ClassPath.expandPath(cp)
-      for entry <- entries.take(10) do
-        println(entry)
+          case _:NullPointerException => // no test if unable to copy jars to outDir
+
 
     finally
       deleteFile(outDir.toFile)

dist/bin/scala

@@ -53,7 +53,7 @@ truncated_params="${*#-}"
 # options_indicator != 0 if at least one parameter is not an option
 options_indicator=$(( ${#all_params} - ${#truncated_params} - $# ))
 
-[ -n "$SCALA_OPTS" ] && set -- $SCALA_OPTS "$@"
+[ -n "$SCALA_OPTS" ] && set -- $SCALA_OPTS $@
 
 while [[ $# -gt 0 ]]; do
   case "$1" in
@@ -67,6 +67,13 @@ while [[ $# -gt 0 ]]; do
       ;;
     -cp | -classpath)
       CLASS_PATH="$2"
+      if [[ $cygwin || $mingw || $msys ]]; then
+        # in Windows, need to protect a single wildcard entry from jdk globbing.
+        # (jdk globbing replaces a single wildcard arg to multiple jar file args!)
+        if [[ $CLASS_PATH =~ \* && ! $CLASS_PATH =~ \; ]]; then
+          CLASS_PATH=";$CLASS_PATH"
+        fi
+      fi
       class_path_count+=1
       shift
       shift