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 rlib-format-packed-bundled-libs and native-link-modifier-bundle run-make tests to rmake #129018

Merged
merged 2 commits into from
Aug 16, 2024
Merged

Migrate rlib-format-packed-bundled-libs and native-link-modifier-bundle run-make tests to rmake #129018

merged 2 commits into from
Aug 16, 2024

Conversation

Oneirical
Copy link
Contributor

@Oneirical Oneirical commented Aug 12, 2024 •
edited by jieyouxu
Loading

Part of #121876 and the associated Google Summer of Code project.

Please try:

// try-job: test-various (ATTEMPTED: IGNORE RESTORED)
try-job: x86_64-msvc
try-job: aarch64-apple
try-job: aarch64-gnu
try-job: x86_64-mingw
try-job: i686-mingw

@rustbot
Copy link
Collaborator

rustbot commented Aug 12, 2024

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added 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-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 Aug 12, 2024
@rustbot
Copy link
Collaborator

rustbot commented Aug 12, 2024

The run-make-support library was changed

cc @jieyouxu

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

@Oneirical Oneirical changed the title Nmemonic artifice Migrate rlib-format-packed-bundled-libs and native-link-modifier to rmake Aug 12, 2024
@Oneirical Oneirical changed the title Migrate rlib-format-packed-bundled-libs and native-link-modifier to rmake Migrate rlib-format-packed-bundled-libs and native-link-modifier run-make tests to rmake Aug 12, 2024
@Oneirical Oneirical changed the title Migrate rlib-format-packed-bundled-libs and native-link-modifier run-make tests to rmake Migrate rlib-format-packed-bundled-libs and native-link-modifier-bundle run-make tests to rmake Aug 12, 2024
@jieyouxu jieyouxu mentioned this pull request Aug 12, 2024
Open
@jieyouxu
Copy link
Member

@bors delegate+ (for try jobs)

@bors
Copy link
Contributor

bors commented Aug 12, 2024

✌️ @Oneirical, you can now approve this pull request!

If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu

@Oneirical
Copy link
Contributor Author

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 12, 2024
@bors
Auto merge of rust-lang#129018 - Oneirical:nmemonic-artifice, r=<try>
cce1476 
Migrate `rlib-format-packed-bundled-libs` and `native-link-modifier-bundle` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

try-job: x86_64-msvc
try-job: test-various
@bors
Copy link
Contributor

bors commented Aug 12, 2024

⌛ Trying commit fe94c51 with merge cce1476...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Aug 12, 2024

💔 Test failed - checks-actions

@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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 12, 2024
@Oneirical
Copy link
Contributor Author

@bors try

@bors
Copy link
Contributor

bors commented Aug 12, 2024

⌛ Trying commit 1d3de31 with merge f34cae2...

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 12, 2024
@bors
Auto merge of rust-lang#129018 - Oneirical:nmemonic-artifice, r=<try>
f34cae2 
Migrate `rlib-format-packed-bundled-libs` and `native-link-modifier-bundle` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

try-job: x86_64-msvc
// try-job: test-various (ATTEMPTED: IGNORE RESTORED)
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Aug 12, 2024

💔 Test failed - checks-actions

@Oneirical
Copy link
Contributor Author

As expected, only the last part of each test fails on MSVC. Instead of ignoring the whole test, I added an !is_msvc() check to run the final phase of each test. @rustbot ready

@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 13, 2024
@bors
Copy link
Contributor

bors commented Aug 14, 2024

☀️ Try build successful - checks-actions
Build commit: e555647 (e55564794fa1d6a7eeb1e30578ab02912b2f9b2f)

@jieyouxu
Copy link
Member

@bors r+ rollup=iffy (native builds and linking shenanigans)

@bors
Copy link
Contributor

bors commented Aug 14, 2024

📌 Commit 30fa7f6 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 Aug 14, 2024
@bors
Copy link
Contributor

bors commented Aug 14, 2024

☔ The latest upstream changes (presumably #128407) 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 Aug 14, 2024
@jieyouxu
Copy link
Member

r=me with a rebase

@Oneirical
Copy link
Contributor Author

@bors r=@jieyouxu

@bors
Copy link
Contributor

bors commented Aug 15, 2024

📌 Commit 51628fb 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 Aug 15, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 15, 2024
@matthiaskrgr
Rollup merge of rust-lang#129018 - Oneirical:nmemonic-artifice, r=jie…
93bc69b 
…youxu

Migrate `rlib-format-packed-bundled-libs` and `native-link-modifier-bundle` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

// try-job: test-various (ATTEMPTED: IGNORE RESTORED)
try-job: x86_64-msvc
try-job: aarch64-apple
try-job: aarch64-gnu
try-job: x86_64-mingw
try-job: i686-mingw
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 15, 2024
Closed
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Aug 16, 2024
@workingjubilee
Rollup merge of rust-lang#129018 - Oneirical:nmemonic-artifice, r=jie…
2f60b7b 
…youxu

Migrate `rlib-format-packed-bundled-libs` and `native-link-modifier-bundle` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

// try-job: test-various (ATTEMPTED: IGNORE RESTORED)
try-job: x86_64-msvc
try-job: aarch64-apple
try-job: aarch64-gnu
try-job: x86_64-mingw
try-job: i686-mingw
@workingjubilee workingjubilee mentioned this pull request Aug 16, 2024
Closed
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Aug 16, 2024
@workingjubilee
Rollup merge of rust-lang#129018 - Oneirical:nmemonic-artifice, r=jie…
4f33fd2 
…youxu

Migrate `rlib-format-packed-bundled-libs` and `native-link-modifier-bundle` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

// try-job: test-various (ATTEMPTED: IGNORE RESTORED)
try-job: x86_64-msvc
try-job: aarch64-apple
try-job: aarch64-gnu
try-job: x86_64-mingw
try-job: i686-mingw
@workingjubilee workingjubilee mentioned this pull request Aug 16, 2024
Closed
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Aug 16, 2024
@workingjubilee
Rollup merge of rust-lang#129018 - Oneirical:nmemonic-artifice, r=jie…
0188ec0 
…youxu

Migrate `rlib-format-packed-bundled-libs` and `native-link-modifier-bundle` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

// try-job: test-various (ATTEMPTED: IGNORE RESTORED)
try-job: x86_64-msvc
try-job: aarch64-apple
try-job: aarch64-gnu
try-job: x86_64-mingw
try-job: i686-mingw
@workingjubilee workingjubilee mentioned this pull request Aug 16, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 16, 2024
@bors
Auto merge of rust-lang#129142 - workingjubilee:rollup-7sspo84, r=wor…
0ab0b0b 
…kingjubilee

Rollup of 10 pull requests

Successful merges:

 - rust-lang#128064 (Improve docs for Waker::noop and LocalWaker::noop)
 - rust-lang#128922 (rust-analyzer: use in-tree `pattern_analysis` crate)
 - rust-lang#128965 (Remove `print::Pat` from the printing of `WitnessPat`)
 - rust-lang#128977 (Only try to modify file times of a writable file on Windows)
 - rust-lang#129018 (Migrate `rlib-format-packed-bundled-libs` and `native-link-modifier-bundle` `run-make` tests to rmake)
 - rust-lang#129037 (Port `run-make/libtest-json` and `run-make/libtest-junit` to rmake)
 - rust-lang#129078 (`ParamEnvAnd::fully_perform`: we have an `ocx`, use it)
 - rust-lang#129110 (Add a comment explaining the return type of `Ty::kind`.)
 - rust-lang#129111 (Port the `sysroot-crates-are-unstable` Python script to rmake)
 - rust-lang#129135 (crashes: more tests)

r? `@ghost`
`@rustbot` modify labels: rollup
@workingjubilee workingjubilee mentioned this pull request Aug 16, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 16, 2024
@bors
Auto merge of rust-lang#129143 - workingjubilee:rollup-h0hzumu, r=wor…
69e36d6 
…kingjubilee

Rollup of 9 pull requests

Successful merges:

 - rust-lang#128064 (Improve docs for Waker::noop and LocalWaker::noop)
 - rust-lang#128922 (rust-analyzer: use in-tree `pattern_analysis` crate)
 - rust-lang#128965 (Remove `print::Pat` from the printing of `WitnessPat`)
 - rust-lang#129018 (Migrate `rlib-format-packed-bundled-libs` and `native-link-modifier-bundle` `run-make` tests to rmake)
 - rust-lang#129037 (Port `run-make/libtest-json` and `run-make/libtest-junit` to rmake)
 - rust-lang#129078 (`ParamEnvAnd::fully_perform`: we have an `ocx`, use it)
 - rust-lang#129110 (Add a comment explaining the return type of `Ty::kind`.)
 - rust-lang#129111 (Port the `sysroot-crates-are-unstable` Python script to rmake)
 - rust-lang#129135 (crashes: more tests)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 759f93f into rust-lang:master Aug 16, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 16, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 16, 2024
@rust-timer
Unrolled build for rust-lang#129018
b1473be 
Rollup merge of rust-lang#129018 - Oneirical:nmemonic-artifice, r=jieyouxu

Migrate `rlib-format-packed-bundled-libs` and `native-link-modifier-bundle` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

// try-job: test-various (ATTEMPTED: IGNORE RESTORED)
try-job: x86_64-msvc
try-job: aarch64-apple
try-job: aarch64-gnu
try-job: x86_64-mingw
try-job: i686-mingw
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.82.0
Development

Successfully merging this pull request may close these issues.
5 participants
@Oneirical @rustbot @jieyouxu @bors @rust-log-analyzer