Break up compiletest runtest.rs into smaller helper modules
#130566
Merged
+2,266
−2,151
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-testsuite
jieyouxu
commented
Sep 19, 2024
| @@ -18,7 +18,7 @@ impl<'test> TestCx<'test> { | |||
| .unwrap_or_else(|| self.fatal("missing --coverage-dump")) | |||
| } | |||
|
|
|||
| pub(crate) fn run_coverage_map_test(&self) { | |||
| pub(super) fn run_coverage_map_test(&self) { | |||
There was a problem hiding this comment.
Remark: changed visibility from pub(crate) -> pub(super) for consistency as it does not need to be visible outside of runtest.rs.
Comment on lines
+4
to
+6
| // FIXME(jieyouxu): `run_rpass_test` got hoisted out of this because apparently valgrind falls back | ||
| // to `run_rpass_test` if valgrind isn't available, which is questionable, but keeping it for | ||
| // refactoring changes to preserve current behavior. |
There was a problem hiding this comment.
Remark: FIXME because valgrind just runs rpass if valgrind isn't available, which is highly questionable.
Comment on lines
+7
to
+12
| // FIXME(jieyouxu): does this really make any sense? If a valgrind test isn't testing | ||
| // valgrind, what is it even testing? | ||
| if self.config.valgrind_path.is_none() { | ||
| assert!(!self.config.force_valgrind); | ||
| return self.run_rpass_test(); | ||
| } |
There was a problem hiding this comment.
Remark: I know this file is still really messy, further changes planned in future PRs.
jieyouxu
added
S-waiting-on-author
jieyouxu
added
the
T-compiler
Previously compiletest's `runtest.rs` was a massive 4700 lines file that made reading and navigation very awkward. This commit intentionally does not neatly reorganize where all the methods on `TestCx` goes, that is intended for a follow-up PR.
jieyouxu
force-pushed
the
breakup-runtest
branch
from
9eccfc1
to
60600a6
Compare
|
This should now be ready for review. |
rustbot
added
S-waiting-on-review
|
Would appreciate feedback if this organization makes sense, or if there's a better way to organize it. (And feel free to reroll :3) |
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 20, 2024
…llaumeGomez Rollup of 6 pull requests Successful merges: - rust-lang#129542 (Add regression test for rust-lang#129541) - rust-lang#129755 (test: cross-edition metavar fragment specifiers) - rust-lang#130566 (Break up compiletest `runtest.rs` into smaller helper modules) - rust-lang#130585 (Add tidy check for rustdoc templates to ensure the whitespace characters are all stripped) - rust-lang#130605 (Fix feature name in test) - rust-lang#130607 ([Clippy] Remove final std paths for diagnostic item) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 20, 2024
Rollup merge of rust-lang#130566 - jieyouxu:breakup-runtest, r=compiler-errors Break up compiletest `runtest.rs` into smaller helper modules Previously compiletest's `runtest.rs` was a massive 4700 lines file that made reading and navigation very awkward. This PR breaks the `runtest.rs` file up into smaller helper modules, one for each test suite/mode. > [!NOTE] > This PR should not contain functional changes, it is intended to be mostly code motion to breakup `runtest.rs` into smaller helper modules to make it easier to digest. > > This PR intentionally does not neatly reorganize where all the methods on `TestCx` goes, that is intended for a follow-up PR. Some methods on `TestCx` do not need to be on `TestCx`. It also does not address a weirdness in valgrind, that is intended for a follow-up PR as well. Part of a series of compiletest cleanups rust-lang#130565. Fixes rust-lang#89475. r? `@ghost` (I need to do a self-review pass first)
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.
Previously compiletest's
runtest.rswas a massive 4700 lines file that made reading and navigation very awkward. This PR breaks theruntest.rsfile up into smaller helper modules, one for each test suite/mode.Note
This PR should not contain functional changes, it is intended to be mostly code motion to breakup
runtest.rsinto smaller helper modules to make it easier to digest.This PR intentionally does not neatly reorganize where all the methods on
TestCxgoes, that is intended for a follow-up PR. Some methods onTestCxdo not need to be onTestCx. It also does not address a weirdness in valgrind, that is intended for a follow-up PR as well.Part of a series of compiletest cleanups #130565.
Fixes #89475.
r? @ghost (I need to do a self-review pass first)