Fix regression: Run the bootstrapped tests with the correct compiler #7443
+25
−46
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In bbfe8a3 I switched javaOptions to
use the jars from dotty-compiler instead of dotty-compiler-bootstrapped,
but that means we never actually put the bootstrapped compiler on the
classpath which is of course wrong. Fixed by making javaOptions just
call
packageAll.valuewhich will get the correct mapping depending onwhether we're in the non-bootstrapped or bootstrapped project, and
dotty-staging/javaOptions now simply forwards to
dotty-compiler-bootstrapped/javaOptions which means we can get rid of
commonDottyJarClasspathSettings.
Also simplified javaOptions in general.