Fix breakage when running compiletest with --test-args=--edition=2015
#139578
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
A-compiletest
|
Some changes occurred in src/tools/compiletest cc @jieyouxu This PR changes a file inside Some changes occurred in tests/ui/sanitizer cc @rcvalle |
This comment has been minimized.
This comment has been minimized.
pietroalbini
force-pushed
the
pa-compiletest-edition
branch
from
aef870e to
f13481b
Compare
tshepang
approved these changes
Apr 9, 2025
jieyouxu
approved these changes
Apr 10, 2025
tests/ui/closures/2229_closure_analysis/preserve_field_drop_order2.rs
Outdated
Show resolved
Hide resolved
|
@rustbot author |
rustbot
added
S-waiting-on-author
|
Reminder, once the PR becomes ready for a review, use |
jieyouxu
reviewed
Apr 10, 2025
pietroalbini
force-pushed
the
pa-compiletest-edition
branch
from
f13481b to
9cf6e8c
Compare
|
@rustbot author |
|
...why did I do that... @rustbot review |
rustbot
added
S-waiting-on-review
jieyouxu
approved these changes
Apr 10, 2025
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 10, 2025
…jieyouxu Fix breakage when running compiletest with `--test-args=--edition=2015` Compiletest has an `--edition` flag to change the default edition tests are run with. Unfortunately no test suite successfully executes when that flag is passed. If the edition is set to something greater than 2015 the breakage is expected, since the test suite currently supports only edition 2015 (Ferrous Systems will open an MCP about fixing that soonish). Surprisingly, the test suite is also broken if `--edition=2015` is passed to compiletest. This PR focuses on fixing the latter. This PR fixes the two categories of failures happening when `--edition=2015` is passed: * Some edition-specific tests set their edition through `//@ compile-flags` instead of `//@ edition`. Compiletest doesn't parse the compile flags, so it would see no `//@ edition` and add another `--edition` flag, leading to a rustc error. * Compiletest would add the edition after `//@ compile-flags`, while some tests depend on flags passed to `//@ compile-flags` being the last flags in the rustc invocation. Note that for the first category, I opted to manually go and replace all `//@ compile-flags` setting an edition with an explicit `//@ edition`. We could've changed compiletest to instead check whether an edition was set in `//@ compile-flags`, but I thought it was better to enforce a consistent way to set the edition in tests. I also added the edition to the stamp, so that changing `--edition` results in tests being re-executed. r? `@jieyouxu`
This comment has been minimized.
This comment has been minimized.
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
|
@bors r=jieyouxu |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
What is this?This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.Comparing 81d8c74 (parent) -> 71b68da (this PR) Test differencesNo test diffs found Job duration changes
How to interpret the job duration changes?Job durations can vary a lot, based on the actual runner instance |
This was referenced Apr 11, 2025
|
Finished benchmarking commit (71b68da): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis benchmark run did not return any relevant results for this metric. Max RSS (memory usage)Results (primary 2.2%)This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesResults (secondary 4.6%)This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 778.797s -> 778.939s (0.02%) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Compiletest has an
--editionflag to change the default edition tests are run with. Unfortunately no test suite successfully executes when that flag is passed. If the edition is set to something greater than 2015 the breakage is expected, since the test suite currently supports only edition 2015 (Ferrous Systems will open an MCP about fixing that soonish). Surprisingly, the test suite is also broken if--edition=2015is passed to compiletest. This PR focuses on fixing the latter.This PR fixes the two categories of failures happening when
--edition=2015is passed://@ compile-flagsinstead of//@ edition. Compiletest doesn't parse the compile flags, so it would see no//@ editionand add another--editionflag, leading to a rustc error.//@ compile-flags, while some tests depend on flags passed to//@ compile-flagsbeing the last flags in the rustc invocation.Note that for the first category, I opted to manually go and replace all
//@ compile-flagssetting an edition with an explicit//@ edition. We could've changed compiletest to instead check whether an edition was set in//@ compile-flags, but I thought it was better to enforce a consistent way to set the edition in tests.I also added the edition to the stamp, so that changing
--editionresults in tests being re-executed.r? @jieyouxu