Skip to content

Migrate foreign-double-unwind, issue-36710 and foreign-exceptions run-make tests to rmake#127926

Merged
bors merged 3 commits into
rust-lang:masterfrom
Oneirical:classical-orctestra
Aug 2, 2024
Merged

Migrate foreign-double-unwind, issue-36710 and foreign-exceptions run-make tests to rmake#127926
bors merged 3 commits into
rust-lang:masterfrom
Oneirical:classical-orctestra

Conversation

@Oneirical

@Oneirical Oneirical commented Jul 18, 2024

Copy link
Copy Markdown
Contributor

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

This is expected to fail CI, I am getting a weird core dumped error on foreign-double-unwind locally. Posting this to start a discussion.

EDIT: I got it, foreign_double_unwind is supposed to fail in the execution stage, but this wasn't obvious, because the original test was just piping the stdout to CGREP (which silently ignores errors).

try-job: aarch64-apple
try-job: armhf-gnu
try-job: test-various
try-job: x86_64-msvc
try-job: x86_64-gnu-llvm-18
try-job: i686-msvc
try-job: dist-i586-gnu-i586-i686-musl

@rustbot

rustbot commented Jul 18, 2024

Copy link
Copy Markdown
Collaborator

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 Jul 18, 2024
@rustbot

rustbot commented Jul 18, 2024

Copy link
Copy Markdown
Collaborator

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

@rust-log-analyzer

This comment has been minimized.

@jieyouxu

Copy link
Copy Markdown
Member

Question: should this be blocked on one of the build_native_lib PRs?

@rust-log-analyzer

This comment has been minimized.

@Oneirical Oneirical force-pushed the classical-orctestra branch from 14d5f2a to 84b648c Compare July 19, 2024 15:36
@Oneirical

Copy link
Copy Markdown
Contributor Author

Disregard the last CI fail, I just forgot to commit the fix. It should pass now.

Question: should this be blocked on one of the build_native_lib PRs?

As far as I am aware, the only other PR that modifies c_build.rs is #127872, which adds build_native_dynamic_lib, an entirely different function.

@jieyouxu

Copy link
Copy Markdown
Member

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 25, 2024
Migrate `foreign-double-unwind`, `issue-36710` and `foreign-exceptions` `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).

~~This is expected to fail CI, I am getting a weird `core dumped` error on `foreign-double-unwind` locally. Posting this to start a discussion.~~

EDIT: I got it, `foreign_double_unwind` is *supposed* to fail in the execution stage, but this wasn't obvious, because the original test was just piping the stdout to `CGREP` (which silently ignores errors).

try-job: aarch64-apple
try-job: armhf-gnu
try-job: test-various
try-job: x86_64-msvc
try-job: x86_64-gnu-llvm-18
try-job: i686-msvc
@bors

bors commented Jul 25, 2024

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 84b648c with merge 82ce034...

@rust-log-analyzer

This comment has been minimized.

@bors

bors commented Jul 25, 2024

Copy link
Copy Markdown
Collaborator

💔 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 Jul 25, 2024
@bors

bors commented Jul 25, 2024

Copy link
Copy Markdown
Collaborator

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

@jieyouxu

Copy link
Copy Markdown
Member

@bors delegate+ (for try job)

@bors

bors commented Jul 26, 2024

Copy link
Copy Markdown
Collaborator

✌️ @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

@jieyouxu

This comment was marked as resolved.

@jieyouxu

Copy link
Copy Markdown
Member

@rustbot review (double check CXX_DEFAULT_FLAGS in compiletest, somehow we're passing -lstdc++ instead of -lc++ only on darwin)

@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 Jul 26, 2024
@Oneirical Oneirical force-pushed the classical-orctestra branch 2 times, most recently from b89be60 to d4345e9 Compare July 26, 2024 17:53
@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 Aug 1, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 1, 2024
Migrate `foreign-double-unwind`, `issue-36710` and `foreign-exceptions` `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).

~~This is expected to fail CI, I am getting a weird `core dumped` error on `foreign-double-unwind` locally. Posting this to start a discussion.~~

EDIT: I got it, `foreign_double_unwind` is *supposed* to fail in the execution stage, but this wasn't obvious, because the original test was just piping the stdout to `CGREP` (which silently ignores errors).

try-job: aarch64-apple
try-job: armhf-gnu
try-job: test-various
try-job: x86_64-msvc
try-job: x86_64-gnu-llvm-18
try-job: i686-msvc
try-job: dist-i586-gnu-i586-i686-musl
@bors

bors commented Aug 1, 2024

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 0e9fa9b with merge 32dafcb...

@bors

bors commented Aug 1, 2024

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-actions
Build commit: 32dafcb (32dafcb852d223ae12a9e51877b57c924ad6f5b0)

@Oneirical Oneirical force-pushed the classical-orctestra branch from 0e9fa9b to 70750dc Compare August 1, 2024 15:13
@Oneirical

Copy link
Copy Markdown
Contributor Author

@rustbot review

@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 Aug 1, 2024
@bors

bors commented Aug 2, 2024

Copy link
Copy Markdown
Collaborator

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

@jieyouxu jieyouxu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks, r=me with a rebase

@jieyouxu

jieyouxu commented Aug 2, 2024

Copy link
Copy Markdown
Member

@bors delegate+

@bors

bors commented Aug 2, 2024

Copy link
Copy Markdown
Collaborator

✌️ @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

@jieyouxu

jieyouxu commented Aug 2, 2024

Copy link
Copy Markdown
Member

@bors rollup=iffy (foreign unwinding, native c/c++ libs, exceptions)

@Oneirical Oneirical force-pushed the classical-orctestra branch from 70750dc to 46b4083 Compare August 2, 2024 14:06
@Oneirical

Copy link
Copy Markdown
Contributor Author

@bors r=@jieyouxu

@bors

bors commented Aug 2, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 46b4083 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 2, 2024
@bors

bors commented Aug 2, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 46b4083 with merge f82eb4d...

@bors

bors commented Aug 2, 2024

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing f82eb4d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 2, 2024
@bors bors merged commit f82eb4d into rust-lang:master Aug 2, 2024
@rustbot rustbot added this to the 1.82.0 milestone Aug 2, 2024
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (f82eb4d): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (secondary 3.6%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
3.6% [3.6%, 3.6%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 759.288s -> 757.978s (-0.17%)
Artifact size: 336.86 MiB -> 336.72 MiB (-0.04%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. 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.

6 participants