[COMPILETEST-UNTANGLE 6/N] Use TestSuite enum instead of stringly-typed test suites
#143870
+44
−20
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
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 |
This comment has been minimized.
This comment has been minimized.
This comment was marked as resolved.
This comment was marked as resolved.
jieyouxu
force-pushed
the
compiletest-maintenance-6
branch
from
342a31a to
b19a508
Compare
jieyouxu
removed
the
S-blocked
rustbot
added
S-waiting-on-review
|
Rebased. |
|
Thanks, you can r=me after PR CI is green. |
|
PR CI is 📗 |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Jul 14, 2025
Rollup of 8 pull requests Successful merges: - #141809 (Don't call WSACleanup on process exit) - #143710 (Updates to random number generation APIs) - #143848 (Rename `stable_mir` and `rustc_smir`) - #143855 (Port `#[omit_gdb_pretty_printer_section]` to the new attribute parsing) - #143868 (warn on align on fields to avoid breaking changes) - #143870 ([COMPILETEST-UNTANGLE 6/N] Use `TestSuite` enum instead of stringly-typed test suites) - #143901 (Region constraint nits) - #143903 (Fix typos in documentation files) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Jul 14, 2025
Rollup merge of #143870 - jieyouxu:compiletest-maintenance-6, r=Kobzol [COMPILETEST-UNTANGLE 6/N] Use `TestSuite` enum instead of stringly-typed test suites This is part of a patch series to untangle `compiletest` to hopefully nudge it towards being more maintainable. This PR should contain no functional changes.
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.
This is part of a patch series to untangle
compiletestto hopefully nudge it towards being more maintainable.This PR should contain no functional changes.