compiletest: Reduce the number of println! calls that don't have access to TestCx
#145982
+30
−83
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
Running `./x --verbose` will still print out the command-line arguments, and setting `RUST_LOG=compiletest` will now log the full config instead of a subset.
When working on a new output-capture system, this will make it easier to obtain a capturing stream from the test context.
The code in this module is always called in the context of running an individual tests, and sometimes prints output that needs to be captured. Moving this module into `runtest` will make it easier to find and audit all of the print statements that need to be updated when overhauling output-capture.
This appears to have been leftover debugging code. If the capture information turns out to have still been useful, we can find a way to emit it in a way that doesn't interfere with overhauling compiletests's output capture system.
|
|
rustbot
added
A-compiletest
|
Some changes occurred in src/tools/compiletest cc @jieyouxu |
|
I was also going to overhaul panic-capture, but that ended up making the PR much larger, so I've split off this initial chunk to make review a bit easier. |
jieyouxu
approved these changes
Aug 29, 2025
| @@ -538,6 +492,8 @@ pub fn opt_str2(maybestr: Option<String>) -> String { | |||
|
|
|||
| /// Called by `main` after the config has been parsed. | |||
| pub fn run_tests(config: Arc<Config>) { | |||
| debug!(?config, "run_tests"); | |||
There was a problem hiding this comment.
Discussion: hm, I think it was originally intended so the config gets logged when run in CI?
EDIT: wait no, that can't be right, I don't remember us passing --verbose in CI 🤔
There was a problem hiding this comment.
If we suspect it's still useful, I can add in a println!("{config:#?}") to just dump the whole config.
(It's mostly redundant with the compiletest command-line arguments that ./x --verbose will print out anyway, but I suppose that seeing the post-parse config could have some value.)
There was a problem hiding this comment.
Hm right. I think we might want to dump the post-parse config under CI env, but not necessary for this PR.
|
You can r=me after PR CI is 🟢 |
|
@bors r=jieyouxu rollup |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Aug 29, 2025
compiletest: Reduce the number of `println!` calls that don't have access to `TestCx`
In order to stop using `#![feature(internal_output_capture)]` in compiletest, we need to be able to capture the console output of individual tests run by the executor.
The approach I have planned is to have all test runners print “console” output into a trait object that is passed around as part of `TestCx`, since almost all test-runner code has easy access to that context. So `println!("foo")` will become `writeln!(self.stdout, "foo")`, and so on.
In order to make that viable, we need to avoid unnecessary printing in places that don't have easy access to `TestCx`. To do so, we can either get rid of unnecessary print statements, or rearrange the code to make the context available. This PR uses both approaches.
r? jieyouxu
bors
added a commit
that referenced
this pull request
Aug 29, 2025
Rollup of 4 pull requests Successful merges: - #145675 (Rehome 30 `tests/ui/issues/` tests to other subdirectories under `tests/ui/` [#1 of Batch #2]) - #145676 (Rehome 30 `tests/ui/issues/` tests to other subdirectories under `tests/ui/` [#2 of Batch #2]) - #145982 (compiletest: Reduce the number of `println!` calls that don't have access to `TestCx`) - #145984 (`TokenStream` cleanups) r? `@ghost` `@rustbot` modify labels: rollup
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.
In order to stop using
#![feature(internal_output_capture)]in compiletest, we need to be able to capture the console output of individual tests run by the executor.The approach I have planned is to have all test runners print “console” output into a trait object that is passed around as part of
TestCx, since almost all test-runner code has easy access to that context. Soprintln!("foo")will becomewriteln!(self.stdout, "foo"), and so on.In order to make that viable, we need to avoid unnecessary printing in places that don't have easy access to
TestCx. To do so, we can either get rid of unnecessary print statements, or rearrange the code to make the context available. This PR uses both approaches.r? jieyouxu