Skip to content

Commit

Permalink
Merge pull request #14033 from dwijnand/move-to-bootstrapCmdTests
Browse files Browse the repository at this point in the history
  • Loading branch information
dwijnand committed Dec 12, 2021
2 parents 22c3322 + 2325972 commit 5fffd2d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 4 additions & 0 deletions project/scripts/bootstrapCmdTests
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ clear_out "$OUT"
./bin/scalac -decompile -color:never "$OUT/out.jar" > "$tmp"
grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp"

echo "testing sbt scalac with suspension"
clear_out "$OUT"
"$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"

# echo ":quit" | ./dist/target/pack/bin/scala # not supported by CI

echo "testing ./bin/scaladoc"
Expand Down
6 changes: 1 addition & 5 deletions project/scripts/cmdTests
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ echo "testing sbt scalac and scala"
"$SBT" ";scalac $SOURCE -d $OUT ;scala -classpath $OUT $MAIN" > "$tmp"
grep -qe "$EXPECTED_OUTPUT" "$tmp"

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

echo "testing sbt scalac with suspension"
clear_out "$OUT"
"$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"

# check that missing source file does not crash message rendering
echo "testing that missing source file does not crash message rendering"
clear_out "$OUT"
Expand Down

0 comments on commit 5fffd2d

Please sign in to comment.