Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate run-make/used to rmake.rs #125988

Merged
merged 1 commit into from
Jun 18, 2024
Merged

Migrate run-make/used to rmake.rs #125988

merged 1 commit into from
Jun 18, 2024

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Jun 4, 2024 •
edited by jieyouxu
Loading

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. labels Jun 4, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 4, 2024

Some changes occurred in run-make tests.

cc @jieyouxu

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Jun 4, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 4, 2024

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez, @jsha

@lqd
Copy link
Member

lqd commented Jun 4, 2024 •
edited
Loading

Is the PR's title accurate? and/or the contents :p

@jieyouxu
Copy link
Member

jieyouxu commented Jun 5, 2024

I am confusion :ferrisClueless:
@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 Jun 5, 2024
@GuillaumeGomez
Copy link
Member Author

I pushed the wrong content to the wrong branch. :o

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-used branch 2 times, most recently from 3101f3e to d8b00ba Compare June 5, 2024 06:56
@GuillaumeGomez
Copy link
Member Author

Ok, the right commits in the right remote branch this time. ^^'

@jieyouxu jieyouxu mentioned this pull request Jun 9, 2024
Open
@Kobzol Kobzol added the A-run-make Area: port run-make Makefiles to rmake.rs label Jun 9, 2024
jieyouxu
jieyouxu reviewed Jun 9, 2024
View reviewed changes
tests/run-make/used/rmake.rs Outdated
fn main() {
rustc().opt_level("3").emit("obj").input("used.rs").run();

let output = Command::new("nm").arg(tmp_dir().join("used.o")).output().unwrap();
Copy link
Member

@jieyouxu jieyouxu Jun 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggestion: we should probably not rely on having nm in the environment. #125787 implements nm on top of third-party libraries, maybe we use that? I'm not going block this PR on that, but this might want to update to the new API, we can first use nm, then replace it when we figure out the non-external-dependency implementation.

Copy link
Member

Choose a reason for hiding this comment

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

If going with external nm, then this could be updated to use the new APIs:

cmd("nm").arg("used.o").run().assert_stdout_contains("FOO");

Copy link
Member Author

Choose a reason for hiding this comment

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

I needed to add a few missing pieces for this code to work but it looks much nicer until we have the nm helper. :)

@rustbot
Copy link
Collaborator

rustbot commented Jun 11, 2024

The run-make-support library was changed

cc @jieyouxu

@GuillaumeGomez GuillaumeGomez changed the title Migrate run-make/used to migrate.rs Migrate run-make/used to rmake.rs Jun 11, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
Copy link
Member Author

Updated!

@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 Jun 13, 2024
@bors
Copy link
Contributor

bors commented Jun 14, 2024

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

@GuillaumeGomez
Copy link
Member Author

Fixed merge conflict.

jieyouxu
jieyouxu requested changes Jun 16, 2024
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thanks. I believe on latest master none of the support library changes are needed since we fixed the issue with cwd() incorrectly derefing into std::command::Command after using .arg() (I tried this locally and the test passes).

@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 Jun 16, 2024
@jieyouxu
Copy link
Member

@rustbot author

@GuillaumeGomez
Copy link
Member Author

Fixed the test and removed the unneeded run-make-support changes.

jieyouxu
jieyouxu approved these changes Jun 16, 2024
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thanks! r=me after CI is green.

@GuillaumeGomez
Copy link
Member Author

@bors r=jieyouxu rollup

@bors
Copy link
Contributor

bors commented Jun 18, 2024

📌 Commit 5b49b68 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 Jun 18, 2024
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jun 18, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 18, 2024
@bors
Auto merge of rust-lang#126630 - GuillaumeGomez:rollup-hlwbpa2, r=Gui…
8814b92 
…llaumeGomez

Rollup of 5 pull requests

Successful merges:

 - rust-lang#125988 (Migrate `run-make/used` to `rmake.rs`)
 - rust-lang#126500 (Migrate `error-found-staticlib-instead-crate`, `output-filename-conflicts-with-directory`, `output-filename-overwrites-input`, `native-link-modifier-verbatim-rustc` and `native-link-verbatim-linker` `run-make` tests to `rmake.rs` format)
 - rust-lang#126583 (interpret: better error when we ran out of memory)
 - rust-lang#126587 (coverage: Add debugging flag `-Zcoverage-options=no-mir-spans`)
 - rust-lang#126621 (More thorough status-quo tests for `#[coverage(..)]`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2d0ef75 into rust-lang:master Jun 18, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 18, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 18, 2024
@rust-timer
Unrolled build for rust-lang#125988
f4626d8 
Rollup merge of rust-lang#125988 - GuillaumeGomez:migrate-run-make-used, r=jieyouxu

Migrate `run-make/used` to `rmake.rs`

Part of rust-lang#121876.

r? `@jieyouxu`
@GuillaumeGomez GuillaumeGomez deleted the migrate-run-make-used branch June 18, 2024 16:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels
A-run-make Area: port run-make Makefiles to rmake.rs 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
Oxidizing run-make tests
Status: Done
Milestone
1.81.0
Development

Successfully merging this pull request may close these issues.
7 participants
@GuillaumeGomez @rustbot @lqd @jieyouxu @rust-log-analyzer @bors @Kobzol