Merge pull request #11191 from dotty-staging/fix-test_non_bootstrapped

Fix `test_non_bootstrapped` workflow

Author: nicolasstucki

project/scripts/bootstrapCmdTests

@@ -38,6 +38,17 @@ clear_out "$OUT1"
 ./bin/scala -classpath "$OUT1" "$MAIN" > "$tmp"
 test "$EXPECTED_OUTPUT" = "$(cat "$tmp")"
 
+# check that `sbt scalac -decompile` runs
+echo "testing sbt scalac -decompile from file"
+./bin/scalac -decompile -color:never "$OUT/$TASTY" > "$tmp"
+grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp"
+
+echo "testing loading tasty from .tasty file in jar"
+clear_out "$OUT"
+./bin/scalac -d "$OUT/out.jar" "$SOURCE"
+./bin/scalac -decompile -color:never "$OUT/out.jar" > "$tmp"
+grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp"
+
 # echo ":quit" | ./dist/target/pack/bin/scala  # not supported by CI
 
 echo "testing ./bin/scalad"

project/scripts/cmdTests

@@ -18,22 +18,11 @@ clear_out "$OUT"
 "$SBT" ";scalac -d $OUT/out.jar $SOURCE ;scalac -from-tasty -d $OUT1 $OUT/out.jar ;scala -classpath $OUT1 $MAIN" > "$tmp"
 grep -qe "$EXPECTED_OUTPUT" "$tmp"
 
-# check that `sbt scalac -decompile` runs
-echo "testing sbt scalac -decompile from file"
-"$SBT" ";scalac -decompile -color:never $OUT/$TASTY" > "$tmp"
-grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp"
-
 echo "testing sbt scala with no -classpath"
 clear_out "$OUT"
 "$SBT" ";scalac $SOURCE ; scala $MAIN" > "$tmp"
 grep -qe "$EXPECTED_OUTPUT" "$tmp"
 
-echo "testing loading tasty from .tasty file in jar"
-clear_out "$OUT"
-"$SBT" ";scalac -d $OUT/out.jar $SOURCE; scalac -decompile -color:never $OUT/out.jar" > "$tmp"
-grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp"
-
-
 echo "testing that paths SourceFile annotations are relativized"
 clear_out "$OUT"
 "$SBT" "scalac -d $OUT/out.jar -sourceroot tests/pos $(pwd)/tests/pos/i10430/lib.scala $(pwd)/tests/pos/i10430/app.scala"