Migrate run-make/used to rmake.rs#125988
Merged
bors merged 1 commit intorust-lang:masterfrom Jun 18, 2024
Merged
Conversation
rustbot
added
A-testsuite
Collaborator
|
Some changes occurred in run-make tests. cc @jieyouxu |
rustbot
added
the
T-bootstrap
GuillaumeGomez
force-pushed
the
migrate-run-make-used
branch
from
3101f3e to
c5469ab
Compare
Collaborator
|
Some changes occurred in HTML/CSS/JS. cc @GuillaumeGomez, @jsha |
Member
|
Is the PR's title accurate? and/or the contents :p |
Member
|
I am confusion :ferrisClueless: |
rustbot
added
S-waiting-on-author
Member
Author
|
I pushed the wrong content to the wrong branch. :o |
GuillaumeGomez
force-pushed
the
migrate-run-make-used
branch
2 times, most recently
from
3101f3e to
d8b00ba
Compare
Member
Author
|
Ok, the right commits in the right remote branch this time. ^^' |
jieyouxu
reviewed
Jun 9, 2024
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(); |
Member
There was a problem hiding this comment.
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.
Member
There was a problem hiding this comment.
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");
Member
Author
There was a problem hiding this comment.
I needed to add a few missing pieces for this code to work but it looks much nicer until we have the nm helper. :)
GuillaumeGomez
force-pushed
the
migrate-run-make-used
branch
from
d8b00ba to
9e19682
Compare
Collaborator
|
The run-make-support library was changed cc @jieyouxu |
GuillaumeGomez
changed the title
run-make/used to migrate.rsrun-make/used to rmake.rs
GuillaumeGomez
force-pushed
the
migrate-run-make-used
branch
from
9e19682 to
9a92eb2
Compare
This comment has been minimized.
This comment has been minimized.
GuillaumeGomez
force-pushed
the
migrate-run-make-used
branch
from
9a92eb2 to
73258b7
Compare
This comment has been minimized.
This comment has been minimized.
GuillaumeGomez
force-pushed
the
migrate-run-make-used
branch
from
73258b7 to
4ebf789
Compare
Member
Author
|
Updated! @rustbot ready |
rustbot
added
S-waiting-on-review
jieyouxu
reviewed
Jun 13, 2024
Collaborator
|
☔ The latest upstream changes (presumably #126463) made this pull request unmergeable. Please resolve the merge conflicts. |
GuillaumeGomez
force-pushed
the
migrate-run-make-used
branch
from
4ebf789 to
3be0c7e
Compare
Member
Author
|
Fixed merge conflict. |
jieyouxu
requested changes
Jun 16, 2024
rustbot
added
S-waiting-on-author
jieyouxu
reviewed
Jun 16, 2024
jieyouxu
reviewed
Jun 16, 2024
Member
|
@rustbot author |
GuillaumeGomez
force-pushed
the
migrate-run-make-used
branch
from
3be0c7e to
5b49b68
Compare
Member
Author
|
Fixed the test and removed the unneeded run-make-support changes. |
jieyouxu
approved these changes
Jun 16, 2024
Member
Author
|
@bors r=jieyouxu rollup |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 18, 2024
…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
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 18, 2024
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`
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Part of #121876.
r? @jieyouxu