Skip to content

Conversation

GuillaumeGomez
Copy link
Member

Part of #121876.

r? @jieyouxu

@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. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 26, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 26, 2024

Some changes occurred in run-make tests.

cc @jieyouxu

@jieyouxu
Copy link
Member

@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 May 26, 2024
@GuillaumeGomez GuillaumeGomez force-pushed the migrate-allow-warnings-cmdline-stability branch from 470bac6 to 5588ca5 Compare May 27, 2024 09:08
@rustbot
Copy link
Collaborator

rustbot commented May 27, 2024

The run-make-support library was changed

cc @jieyouxu

@GuillaumeGomez
Copy link
Member Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 27, 2024
Comment on lines 7 to 9
let output = rustc().input("foo.rs").arg("-Awarnings").command_output();

assert!(output.status.success());
Copy link
Member

@jieyouxu jieyouxu May 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: I think this can be run() instead of command_output(), because run() provided by impl_common_helpers!(Rustc) is

/// Run the constructed command and assert that it is successfully run.
#[track_caller]
pub fn run(&mut self) -> ::std::process::Output {
    let caller_location = ::std::panic::Location::caller();
    let caller_line_number = caller_location.line();

    let output = self.command_output();
    if !output.status.success() {
        handle_failed_output(&self.cmd, output, caller_line_number);
    }
    output
}

i.e. just

let output = rustc().input("foo.rs").arg("-Awarnings").run();

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need the output below to get stdout and stderr. ;)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh wait, nevermind. Yes you're absolutely right, good catch!

@jieyouxu
Copy link
Member

Thanks, one suggestion then r=me.

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-allow-warnings-cmdline-stability branch from 5588ca5 to c2dd262 Compare May 27, 2024 12:35
@jieyouxu
Copy link
Member

Thanks! @bors r+ rollup

@bors
Copy link
Collaborator

bors commented May 27, 2024

📌 Commit c2dd262 has been approved by jieyouxu

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-review Status: Awaiting review from the assignee but also interested parties. labels May 27, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request May 27, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#125339 (The number of tests does not depend on the architecture's pointer width)
 - rust-lang#125539 (crashes: increment the number of tracked ones)
 - rust-lang#125542 (Migrate rustdoc verify output files)
 - rust-lang#125613 (Use `rmake` for `windows-` run-make tests)
 - rust-lang#125616 (MIR validation: ensure that downcast projection is followed by field projection)

Failed merges:

 - rust-lang#125573 (Migrate `run-make/allow-warnings-cmdline-stability` to `rmake.rs`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request May 27, 2024
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#125339 (The number of tests does not depend on the architecture's pointer width)
 - rust-lang#125542 (Migrate rustdoc verify output files)
 - rust-lang#125616 (MIR validation: ensure that downcast projection is followed by field projection)
 - rust-lang#125625 (Use grep to implement verify-line-endings)

Failed merges:

 - rust-lang#125573 (Migrate `run-make/allow-warnings-cmdline-stability` to `rmake.rs`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented May 27, 2024

☔ The latest upstream changes (presumably #125628) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 27, 2024
@GuillaumeGomez GuillaumeGomez force-pushed the migrate-allow-warnings-cmdline-stability branch from c2dd262 to 404d47e Compare May 28, 2024 09:24
@GuillaumeGomez
Copy link
Member Author

@bors r=jieyouxu rollup

@bors
Copy link
Collaborator

bors commented May 28, 2024

📌 Commit 404d47e has been approved by jieyouxu

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 May 28, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 28, 2024
…ngs-cmdline-stability, r=jieyouxu

Migrate `run-make/allow-warnings-cmdline-stability` to `rmake.rs`

Part of rust-lang#121876.

r? `@jieyouxu`
bors added a commit to rust-lang-ci/rust that referenced this pull request May 28, 2024
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#117671 (NVPTX: Avoid PassMode::Direct for args in C abi)
 - rust-lang#124251 (Add an intrinsic for `ptr::metadata`)
 - rust-lang#125573 (Migrate `run-make/allow-warnings-cmdline-stability` to `rmake.rs`)
 - rust-lang#125590 (Add a "Setup Python" action for github-hosted runners and remove unnecessary `CUSTOM_MINGW` environment variable)
 - rust-lang#125598 (Make `ProofTreeBuilder` actually generic over `Interner`)
 - rust-lang#125637 (rustfmt fixes)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request May 28, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#117671 (NVPTX: Avoid PassMode::Direct for args in C abi)
 - rust-lang#125573 (Migrate `run-make/allow-warnings-cmdline-stability` to `rmake.rs`)
 - rust-lang#125590 (Add a "Setup Python" action for github-hosted runners and remove unnecessary `CUSTOM_MINGW` environment variable)
 - rust-lang#125598 (Make `ProofTreeBuilder` actually generic over `Interner`)
 - rust-lang#125637 (rustfmt fixes)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 78b4caf into rust-lang:master May 28, 2024
@rustbot rustbot added this to the 1.80.0 milestone May 28, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 28, 2024
Rollup merge of rust-lang#125573 - GuillaumeGomez:migrate-allow-warnings-cmdline-stability, r=jieyouxu

Migrate `run-make/allow-warnings-cmdline-stability` to `rmake.rs`

Part of rust-lang#121876.

r? ``@jieyouxu``
@GuillaumeGomez GuillaumeGomez deleted the migrate-allow-warnings-cmdline-stability branch May 28, 2024 21:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants