Fix windows CI

scala · Dec 14, 2021 · d0d7022 · d0d7022
1 parent 4b74afb
commit d0d7022
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -181,7 +181,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Test
-        run: sbt ";scala3-bootstrapped/compile ;scala3-bootstrapped/test"
+        run: sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test"
         shell: cmd
 
       - name: Scala.js Test

diff --git a/compiler/test-resources/scripting/classpathReport.sc b/compiler/test-resources/scripting/classpathReport.sc
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S bin/scala -classpath 'dist/target/pack/lib/*'
+#!bin/scala -classpath 'dist/target/pack/lib/*'
 
 import java.nio.file.Paths
 

diff --git a/compiler/test-resources/scripting/unglobClasspath.sc b/compiler/test-resources/scripting/unglobClasspath.sc
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S bin/scala -classpath 'dist/target/pack/lib/*'
+#!bin/scala -classpath 'dist/target/pack/lib/*'
 
 // won't compile unless the hashbang line sets classpath
 import org.jline.terminal.Terminal

diff --git a/compiler/test/dotty/tools/scripting/ClasspathTests.scala b/compiler/test/dotty/tools/scripting/ClasspathTests.scala
@@ -88,7 +88,7 @@ class ClasspathTests:
 
 
 //////////////// end of tests ////////////////
-lazy val cwd = Paths.get(".").toAbsolutePath
+lazy val cwd = Paths.get(".").toAbsolutePath.normalize
 lazy val wildcardEntry = "dist/target/pack/lib/*"
 
 def listJars(dir: String) =

diff --git a/dist/bin/scala b/dist/bin/scala
@@ -45,6 +45,16 @@ while [[ $# -gt 0 ]]; do
       addScala "$1"
       shift
       ;;
+    -classpath*)
+      if [ "$1" != "${1##* }" ]; then
+        # hashbang-combined args "-classpath 'lib/*'"
+        A=$1 ; shift # consume $1 before adding its substrings back
+        set -- $A "$@" # split $1 on whitespace and put it back
+      else
+        addScala "$1"
+        shift
+      fi
+      ;;
     *)
       addScala "$1"
       shift