Skip to content

Allow passing the --nocapture flag to compiletest - #109445

Merged
bors merged 1 commit into
rust-lang:masterfrom
Teapot4195:issue-109407-fix
Mar 27, 2023
Merged

Allow passing the --nocapture flag to compiletest#109445
bors merged 1 commit into
rust-lang:masterfrom
Teapot4195:issue-109407-fix

Conversation

@Teapot4195

@Teapot4195 Teapot4195 commented Mar 21, 2023

Copy link
Copy Markdown
Contributor

closes #109407

@rustbot

rustbot commented Mar 21, 2023

Copy link
Copy Markdown
Collaborator

r? @ozkanonur

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 21, 2023
@Teapot4195
Teapot4195 force-pushed the issue-109407-fix branch 2 times, most recently from a5a6260 to 9d2f2f3 Compare March 21, 2023 13:49
onur-ozkan
onur-ozkan reviewed Mar 21, 2023
View reviewed changes
Comment thread src/tools/compiletest/src/main.rs Outdated
onur-ozkan
onur-ozkan reviewed Mar 21, 2023
View reviewed changes
Comment thread src/tools/compiletest/src/common.rs Outdated
@Teapot4195
Teapot4195 force-pushed the issue-109407-fix branch 2 times, most recently from a06efe2 to 9842236 Compare March 21, 2023 16:19
@onur-ozkan

onur-ozkan commented Mar 21, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

changing that to accept --nocapture seems useful

@jyn514 With this PR we check RUST_TEST_NOCAPTURE if --nocapture is not provided, and ignore RUST_TEST_NOCAPTURE if --nocapture is provided. I am not sure if we should completely get rid of RUST_TEST_NOCAPTURE. I leave the decision to you.

@jyn514

jyn514 commented Mar 21, 2023

Copy link
Copy Markdown
Member

@ozkanonur i think it's ok to get rid of RUST_TEST_NOCAPTURE, but maybe print a warning if it's set pointing people to the new argument.

@onur-ozkan

onur-ozkan commented Mar 22, 2023

Copy link
Copy Markdown
Contributor

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 22, 2023
@Teapot4195
Teapot4195 force-pushed the issue-109407-fix branch 4 times, most recently from 7829f96 to 2da8d85 Compare March 24, 2023 21:32
onur-ozkan
onur-ozkan reviewed Mar 24, 2023
View reviewed changes
Comment thread src/tools/compiletest/src/main.rs Outdated
@Teapot4195
Teapot4195 force-pushed the issue-109407-fix branch 3 times, most recently from 79102fa to f775ca6 Compare March 25, 2023 00:06
onur-ozkan
onur-ozkan reviewed Mar 25, 2023
View reviewed changes
Comment thread src/tools/compiletest/src/main.rs Outdated
@onur-ozkan

onur-ozkan commented Mar 27, 2023

Copy link
Copy Markdown
Contributor

thank you for the fix :)

@bors r+ rollup

@bors

bors commented Mar 27, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 2fe4cad has been approved by ozkanonur

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 27, 2023
@GuillaumeGomez GuillaumeGomez mentioned this pull request Mar 27, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 27, 2023
@bors
Auto merge of rust-lang#109668 - GuillaumeGomez:rollup-j01if4b, r=Gui…
2036fdd 
…llaumeGomez

Rollup of 6 pull requests

Successful merges:

 - rust-lang#109330 (rustdoc: Fix ICE for intra-doc link on intermediate re-export)
 - rust-lang#109354 (Remove the `NodeId` of `ast::ExprKind::Async`)
 - rust-lang#109445 (Allow passing the --nocapture flag to compiletest)
 - rust-lang#109512 (bump `askama_derive` to 0.12.1)
 - rust-lang#109637 (Add missing needs-asm-support annotation to ui/simple_global_asm.rs)
 - rust-lang#109666 (Correct ASCII case comment)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit df453d9 into rust-lang:master Mar 27, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@onur-ozkan onur-ozkan onur-ozkan left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@onur-ozkan onur-ozkan

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.70.0

Development

Successfully merging this pull request may close these issues.

Allow passing the --nocapture flag to compiletest

5 participants

@Teapot4195 @rustbot @onur-ozkan @jyn514 @bors