[COMPILETEST-UNTANGLE 6/N] Use TestSuite enum instead of stringly-typed test suites
#143870
+185
−174
Conversation
This file contains hidden or 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
They do not have sensible defaults, and it is crucial that we get them right.
It is *critical* that we maintain clear nomenclature in `compiletest`. We have many types of "modes" in `compiletest` -- pass modes, coverage modes, compare modes, you name it. `Mode` is also a *super* general term. Rename it to `TestMode` to leave no room for such ambiguity. As a follow-up, I also intend to introduce an enum for `TestSuite`, then rid of all usage of glob re-exported `TestMode::*` enum variants -- many test suites share the same name as the test mode.
I would like to introduce `TestSuite` over stringly-typed test suite names, and some test suite names are the same as test modes, which can make this very confusing.
jieyouxu
added
the
S-blocked
rustbot
added
A-compiletest
jieyouxu
commented
Jul 13, 2025
| @@ -869,7 +867,6 @@ const COMPILETEST_DIRECTIVE_PREFIX: &str = "//@"; | |||
|
|
|||
| fn iter_directives( | |||
| mode: TestMode, | |||
| _suite: &str, | |||
There was a problem hiding this comment.
Remark: removed as this is (at the moment) unused.
jieyouxu
commented
Jul 13, 2025
Comment on lines
+56
to
+80
| // Note that coverage tests use the same test files for multiple test modes. | ||
| string_enum! { | ||
| #[derive(Clone, Copy, PartialEq, Debug)] | ||
| pub enum TestSuite { | ||
| Assembly => "assembly", | ||
| Codegen => "codegen", | ||
| CodegenUnits => "codegen-units", | ||
| Coverage => "coverage", | ||
| CoverageRunRustdoc => "coverage-run-rustdoc", | ||
| Crashes => "crashes", | ||
| Debuginfo => "debuginfo", | ||
| Incremental => "incremental", | ||
| MirOpt => "mir-opt", | ||
| Pretty => "pretty", | ||
| RunMake => "run-make", | ||
| Rustdoc => "rustdoc", | ||
| RustdocGui => "rustdoc-gui", | ||
| RustdocJs => "rustdoc-js", | ||
| RustdocJsStd=> "rustdoc-js-std", | ||
| RustdocJson => "rustdoc-json", | ||
| RustdocUi => "rustdoc-ui", | ||
| Ui => "ui", | ||
| UiFullDeps => "ui-fulldeps", | ||
| } | ||
| } |
There was a problem hiding this comment.
Remark: probably will want to share this definition in the future with bootstrap, but strive for compiletest-internal self-consistency first (à la #135653, but don't want to do that yet to make compiletest refactorings less annoying).
|
Looks simple enough, and a nice cleanup. |
|
r? @Kobzol |
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
☔ The latest upstream changes (presumably #143867) made this pull request unmergeable. Please resolve the merge conflicts. |
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.
Caution
Stacked on top of #143823.
This is part of a patch series to untangle
compiletestto hopefully nudge it towards being more maintainable.This PR should contain no functional changes.