Skip to content

Commit 41b53f2

Browse files
committed
Fix test_non_bootstrapped workflow
1 parent 6d9e101 commit 41b53f2

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

project/scripts/bootstrapCmdTests

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,17 @@ clear_out "$OUT1"
3838
./bin/scala -classpath "$OUT1" "$MAIN" > "$tmp"
3939
test "$EXPECTED_OUTPUT" = "$(cat "$tmp")"
4040

41+
# check that `sbt scalac -decompile` runs
42+
echo "testing sbt scalac -decompile from file"
43+
./bin/scalac -decompile -color:never "$OUT/$TASTY" > "$tmp"
44+
grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp"
45+
46+
echo "testing loading tasty from .tasty file in jar"
47+
clear_out "$OUT"
48+
./bin/scalac -d "$OUT/out.jar" "$SOURCE"
49+
./bin/scalac -decompile -color:never "$OUT/out.jar" > "$tmp"
50+
grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp"
51+
4152
# echo ":quit" | ./dist/target/pack/bin/scala # not supported by CI
4253

4354
echo "testing ./bin/scalad"

project/scripts/cmdTests

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,11 @@ clear_out "$OUT"
1818
"$SBT" ";scalac -d $OUT/out.jar $SOURCE ;scalac -from-tasty -d $OUT1 $OUT/out.jar ;scala -classpath $OUT1 $MAIN" > "$tmp"
1919
grep -qe "$EXPECTED_OUTPUT" "$tmp"
2020

21-
# check that `sbt scalac -decompile` runs
22-
echo "testing sbt scalac -decompile from file"
23-
"$SBT" ";scalac -decompile -color:never $OUT/$TASTY" > "$tmp"
24-
grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp"
25-
2621
echo "testing sbt scala with no -classpath"
2722
clear_out "$OUT"
2823
"$SBT" ";scalac $SOURCE ; scala $MAIN" > "$tmp"
2924
grep -qe "$EXPECTED_OUTPUT" "$tmp"
3025

31-
echo "testing loading tasty from .tasty file in jar"
32-
clear_out "$OUT"
33-
"$SBT" ";scalac -d $OUT/out.jar $SOURCE; scalac -decompile -color:never $OUT/out.jar" > "$tmp"
34-
grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp"
35-
36-
3726
echo "testing that paths SourceFile annotations are relativized"
3827
clear_out "$OUT"
3928
"$SBT" "scalac -d $OUT/out.jar -sourceroot tests/pos $(pwd)/tests/pos/i10430/lib.scala $(pwd)/tests/pos/i10430/app.scala"

0 commit comments

Comments
 (0)