don't load scala version from java properties

Author: bishabosha

compiler/src/dotty/tools/dotc/Run.scala

@@ -307,9 +307,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
             else doTypeCheck()
         )
 
-      inContext(unitCtx) {
-        process()
-      }
+      process()(using unitCtx)
     }
 
   private sealed trait PrintedTree

project/scripts/bootstrapCmdTests

@@ -84,11 +84,22 @@ 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 inlining"
+# Here we will test that an inline method symbol loaded from the sourcepath (-sourcepath compiler option)
+# will have its `defTree` correctly set when its method body is required for inlining.
+# So far I have not found a way to replicate issue https://github.com/lampepfl/dotty/issues/13994
+# with sbt scripted tests, if a way is found, move this test there.
 cwd=$(pwd)
-java_prop="-Dpack.version.file=$cwd/dist/target/pack/VERSION"
-sbt_test_command=";clean;prepareSources;compile;copyChanges;compile"
-(cd "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline" && "$SBT" "$java_prop" "$sbt_test_command")
+sbt_test_command="++${scala_version}!;clean;prepareSources;compile;copyChanges;compile"
+(cd "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline" && "$SBT" "$sbt_test_command")
 rm -rf "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline/target"
 rm -rf "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/target"
 rm -f "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline/src/main/scala/a/zz.scala"

project/scripts/cmdTestsCommon.inc.sh

@@ -14,6 +14,11 @@ OUT=$(mktemp -d)
 OUT1=$(mktemp -d)
 tmp=$(mktemp)
 
+die () {
+    echo >&2 "$@"
+    exit 1
+}
+
 clear_out()
 {
   local out="$1"

project/scripts/sbt

@@ -2,23 +2,12 @@
 set -e
 
 # Usage:
-# ./sbt <props*> <cmd>
+# ./sbt <cmd>
 
-declare -a sys_props
-declare -a sbt_commands
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    -D*) sys_props+=("$1") && shift ;;
-    *) sbt_commands+=("$1") && shift ;;
-  esac
-done
-
-CMD="${sbt_commands[0]:?Missing sbt command}"
+CMD="${1:?Missing sbt command}"
 
 # run sbt with the supplied arg
 sbt -J-XX:ReservedCodeCacheSize=512m \
     -DSBT_PGP_USE_GPG=false \
-    "${sys_props[@]}" \
     -no-colors \
     "$CMD"