Skip to content

Commit 11560cb

Browse files
committed
Don't run bootstrapped tests with java 11
And revert changes to staging test The dotty-staging handling of classpath does not work with Java 11. Two bootstrap-only tests sepcific to staging failed. (1) Failure in `project/scripts/bootstrapCmdTests` + ./project/scripts/sbt ';dotty-compiler-bootstrapped/dotc -with-compiler tests/run-staging/quote-run.scala; dotty-compiler-bootstrapped/dotr -with-compiler Test' Exception in thread "main" dotty.tools.dotc.MissingCoreLibraryException: Could not find package scalaShadowing from compiler core libraries. Make sure the compiler core libraries are on the classpath. at dotty.tools.dotc.core.Denotations$.select$1(Denotations.scala:1222) at dotty.tools.dotc.core.Denotations$.recurSimple$1(Denotations.scala:1250) at dotty.tools.dotc.core.Denotations$.recur$1(Denotations.scala:1252) at dotty.tools.dotc.core.Denotations$.staticRef(Denotations.scala:1254) at dotty.tools.dotc.core.Symbols$.requiredPackage(Symbols.scala:890) at dotty.tools.dotc.core.Definitions.ScalaShadowingPackage(Definitions.scala:255) at dotty.tools.dotc.core.Definitions.init(Definitions.scala:1496) at dotty.tools.dotc.core.Contexts$ContextBase.initialize(Contexts.scala:790) at dotty.tools.dotc.core.Contexts$Context.initialize(Contexts.scala:554) at dotty.tools.dotc.Run.rootContext(Run.scala:64) at dotty.tools.dotc.Run.<init>(Run.scala:84) at scala.quoted.staging.QuoteCompiler$ExprRun.<init>(QuoteCompiler.scala:102) at scala.quoted.staging.QuoteCompiler.newRun(QuoteCompiler.scala:45) at scala.quoted.staging.QuoteDriver.run(QuoteDriver.scala:40) at scala.quoted.staging.Toolbox$$anon$1.run(Toolbox.scala:36) at scala.quoted.staging.package$.run(staging.scala:19) at Test$.main(quote-run.scala:12) at Test.main(quote-run.scala) (2) tests/run-staging/i6992 -- Error: tests/run-staging/i6992/Test_2.scala:7:16 ------------------------------- 7 | println(mcr {foo}) | ^^^^^^^^^ | Exception occurred while executing macro expansion. | dotty.tools.dotc.MissingCoreLibraryException: Could not find package scalaShadowing from compiler core libraries. | Make sure the compiler core libraries are on the classpath.
1 parent d8d8097 commit 11560cb

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

.github/workflows/ci.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ jobs:
5858
container: lampepfl/dotty:2020-04-24
5959

6060
steps:
61-
- name: Set up JDK version
62-
run: echo "::add-path::/usr/lib/jvm/java-11-openjdk-amd64/bin"
63-
6461
- name: Checkout cleanup script
6562
uses: actions/checkout@v2
6663

tests/run-staging/i6992/Macro_1.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import scala.quoted._
33
import scala.quoted.staging._
44

5-
// given Toolbox = Toolbox.make(getClass.getClassLoader)
5+
given Toolbox = Toolbox.make(getClass.getClassLoader)
66

77
object macros {
88
inline def mcr(x: => Any): Any = ${mcrImpl('x)}
@@ -13,7 +13,7 @@ object macros {
1313
import ctx.tasty._
1414
try {
1515
body match {
16-
case '{$x: Foo} => x // Expr(run(x).x)
16+
case '{$x: Foo} => Expr(run(x).x)
1717
}
1818
} catch {
1919
case ex: scala.quoted.ScopeException =>

0 commit comments

Comments
 (0)