fix project/scripts/bootstrappedOnlyCmdTests for new scala launcher

Author: bishabosha

project/scripts/bootstrappedOnlyCmdTests

@@ -18,28 +18,37 @@ grep -qe "val a: scala.Int = 3" "$tmp"
 # setup for `scalac`/`scala` script tests
 "$SBT" dist/pack
 
+echo "capturing scala version from dist/target/pack/VERSION"
+IFS=':=' read -ra versionProps < "$ROOT/dist/target/pack/VERSION" # temporarily set IFS to ':=' to split versionProps
+[ ${#versionProps[@]} -eq 3 ] && \
+  [ ${versionProps[0]} = "version" ] && \
+  [ -n ${versionProps[2]} ] || die "Expected non-empty 'version' property in $ROOT/dist/target/pack/VERSION"
+scala_version=${versionProps[2]}
+
 # check that `scalac` compiles and `scala` runs it
 echo "testing ./bin/scalac and ./bin/scala"
 clear_out "$OUT"
 ./bin/scalac "$SOURCE" -d "$OUT"
-./bin/scala -classpath "$OUT" "$MAIN" > "$tmp"
+./bin/scala -classpath "$OUT" -M "$MAIN" > "$tmp"
 test "$EXPECTED_OUTPUT" = "$(cat "$tmp")"
 
 # Test scaladoc based on compiled classes
 ./bin/scaladoc -project Staging -d "$OUT1" "$OUT"
 clear_out "$OUT1"
 
-# check that `scalac` and `scala` works for staging
+# check that `scalac` and `scala` works for staging.
+# TODO: scala3-staging should be automatically added by Scala CLI
+#   - see: https://github.com/VirtusLab/scala-cli/issues/2879
 clear_out "$OUT"
 ./bin/scalac tests/run-staging/i4044f.scala -d "$OUT"
-./bin/scala -with-compiler -classpath "$OUT" Test > "$tmp"
+./bin/scala -with-compiler -classpath "$OUT" --dep "org.scala-lang::scala3-staging:$scala_version" -M Test > "$tmp"
 
 # check that `scalac -from-tasty` compiles and `scala` runs it
 echo "testing ./bin/scalac -from-tasty and scala -classpath"
 clear_out "$OUT1"
 ./bin/scalac "$SOURCE" -d "$OUT"
 ./bin/scalac -from-tasty -d "$OUT1" "$OUT/$TASTY"
-./bin/scala -classpath "$OUT1" "$MAIN" > "$tmp"
+./bin/scala -classpath "$OUT1" -M "$MAIN" > "$tmp"
 test "$EXPECTED_OUTPUT" = "$(cat "$tmp")"
 
 # check that `sbt scalac -decompile` runs
@@ -90,10 +99,12 @@ clear_out "$OUT"
 ./bin/scalac -help > "$tmp" 2>&1
 grep -qe "Usage: scalac <options> <source files>" "$tmp"
 
+# TODO: JAVA launcher should be able to override "scala-cli" program name
+#  - see: https://github.com/VirtusLab/scala-cli/issues/2838#issuecomment-2085130815
 ./bin/scala -help > "$tmp" 2>&1
-grep -qe "Usage: scala <options> <source files>" "$tmp"
+grep -qe "See 'scala-cli <command> --help' to read about a specific subcommand." "$tmp"
 
-./bin/scala -d hello.jar tests/run/hello.scala
+./bin/scala -d hello.jar tests/run/hello.scala --server=false
 ls hello.jar
 
 echo "testing i12973"
@@ -102,14 +113,6 @@ clear_out "$OUT"
 echo "Bug12973().check" | TERM=dumb ./bin/scala -cp "$OUT/out.jar" > "$tmp" 2>&1
 grep -qe "Bug12973 is fixed" "$tmp"
 
-echo "capturing scala version from dist/target/pack/VERSION"
-cwd=$(pwd)
-IFS=':=' read -ra versionProps < "$cwd/dist/target/pack/VERSION" # temporarily set IFS to ':=' to split versionProps
-[ ${#versionProps[@]} -eq 3 ] && \
-  [ ${versionProps[0]} = "version" ] && \
-  [ -n ${versionProps[2]} ] || die "Expected non-empty 'version' property in $cwd/dist/target/pack/VERSION"
-scala_version=${versionProps[2]}
-
 echo "testing -sourcepath with incremental compile: inlining changed inline def into a def"
 # Here we will test that a changed inline method symbol loaded from the sourcepath (-sourcepath compiler option)
 # will have its `defTree` correctly set when its method body is required for inlining.