Skip to content

Commit 5fffd2d

Browse files
authored
Merge pull request #14033 from dwijnand/move-to-bootstrapCmdTests
2 parents 22c3322 + 2325972 commit 5fffd2d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

project/scripts/bootstrapCmdTests

+4
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ clear_out "$OUT"
5353
./bin/scalac -decompile -color:never "$OUT/out.jar" > "$tmp"
5454
grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp"
5555

56+
echo "testing sbt scalac with suspension"
57+
clear_out "$OUT"
58+
"$SBT" "scala3-compiler-bootstrapped/scalac -d $OUT tests/pos-macros/macros-in-same-project-1/Bar.scala tests/pos-macros/macros-in-same-project-1/Foo.scala" > "$tmp"
59+
5660
# echo ":quit" | ./dist/target/pack/bin/scala # not supported by CI
5761

5862
echo "testing ./bin/scaladoc"

project/scripts/cmdTests

+1-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ echo "testing sbt scalac and scala"
77
"$SBT" ";scalac $SOURCE -d $OUT ;scala -classpath $OUT $MAIN" > "$tmp"
88
grep -qe "$EXPECTED_OUTPUT" "$tmp"
99

10-
# check that `sbt scalac` compiles and `sbt scala` runs it
10+
# check that `sbt scalac -from-tasty` compiles and `sbt scala` runs it
1111
echo "testing sbt scalac -from-tasty and scala -classpath"
1212
clear_out "$OUT"
1313
"$SBT" ";scalac $SOURCE -d $OUT ;scalac -from-tasty -d $OUT1 $OUT/$TASTY ;scala -classpath $OUT1 $MAIN" > "$tmp"
@@ -47,10 +47,6 @@ if grep -q "tests/pos/i10430/app.scala" "$tmp"; then
4747
exit 1
4848
fi
4949

50-
echo "testing sbt scalac with suspension"
51-
clear_out "$OUT"
52-
"$SBT" "scala3-compiler-bootstrapped/scalac -d $OUT tests/pos-macros/macros-in-same-project-1/Bar.scala tests/pos-macros/macros-in-same-project-1/Foo.scala" > "$tmp"
53-
5450
# check that missing source file does not crash message rendering
5551
echo "testing that missing source file does not crash message rendering"
5652
clear_out "$OUT"

0 commit comments

Comments
 (0)