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/c-link-to-rust-staticlib to rmake #125027

Merged
merged 3 commits into from
May 15, 2024
Merged

Migrate run-make/c-link-to-rust-staticlib to rmake #125027

merged 3 commits into from
May 15, 2024

Conversation

Oneirical
Copy link
Contributor

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

rustbot commented May 11, 2024

Some changes occurred in run-make tests.

cc @jieyouxu

@jieyouxu jieyouxu mentioned this pull request May 13, 2024
Open
jieyouxu
jieyouxu reviewed May 13, 2024
View reviewed changes
tests/run-make/c-link-to-rust-staticlib/rmake.rs Outdated
// See https://github.com/rust-lang/rust/issues/10434

//@ ignore-cross-compile
//@ ignore-freebsd
Copy link
Member

Choose a reason for hiding this comment

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

Is there a good reason for ignore-freebsd?

Copy link
Contributor Author

@Oneirical Oneirical May 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I found this commit which added the FreeBSD ignore. Seems linked to #12460, which was a looooong time ago and had a different-looking Makefile back then. Let's see if we can remove it.

You can see how cursed this really is, because in another issue, they fix a test on FreeBSD... by adding one second to the sleep command.

@jieyouxu
Copy link
Member

Unless there's a good reason for ignore-freebsd, we can try to land this port without that ignore that see if it fails in full build. Let me know if there's a good reason for that ignore, or remove that ignore and we can try to merge.

@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 13, 2024
@Oneirical
Copy link
Contributor Author

Ignore statement removed.

and we can try to merge.

Would it be pertinent to follow the "try builds" section in this page to force the CI to use FreeBSD, and see what happens?

@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 May 14, 2024
@jieyouxu
Copy link
Member

Yes please give this PR a try on a FreeBSD CI job if possible

@jieyouxu
Copy link
Member

@bors rollup=iffy

@jieyouxu
Copy link
Member

You'll want to follow this https://rustc-dev-guide.rust-lang.org/tests/ci.html?highlight=CI#testing-with-ci not the infra page

@rustbot rustbot added the T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. label May 14, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Oneirical
Copy link
Contributor Author

Oneirical commented May 14, 2024 •
edited
Loading

Looks like the FreeBSD ignore was there for a reason. Ignore statement restored.

Though, looking at the logs, the build passed, it's just the upload of artifacts which failed? Does this have anything to do with the test?

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented May 14, 2024

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

@jieyouxu
Copy link
Member

jieyouxu commented May 14, 2024 •
edited
Loading

Looks like the FreeBSD ignore was there for a reason. Ignore statement restored.

Though, looking at the logs, the build passed, it's just the upload of artifacts which failed? Does this have anything to do with the test?

CI looks unrelated, can you remove the ignore-freebsd? We'll try merging without ignore-freebsd

@rustbot rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 14, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 14, 2024

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git pull --rebase https://github.com/rust-lang/rust.git master
$ git push --force-with-lease

The following commits are merge commits:

@jieyouxu
Copy link
Member

You'll probably have to rebase :3

@Oneirical
Copy link
Contributor Author

You'll probably have to rebase :3

Yep, I accidentally clicked the wrong button on the Github website while looking at the merge conflict.
In order to avoid a repeat of The Incident, I'll go get access to my laptop in a bit and amend that merge.

@jieyouxu
Copy link
Member

GitHub's merge UI is almost always a trap. I just do merge conflict resolution offline.

@jieyouxu
Copy link
Member

Let us give arbitrary try jobs a try (heh)

@bors try

@bors
Copy link
Contributor

bors commented May 14, 2024

⌛ Trying commit b1e5e51 with merge bb99ac5...

bors added a commit to rust-lang-ci/rust that referenced this pull request May 14, 2024
@bors
Auto merge of rust-lang#125027 - Oneirical:c-test-with-remove, r=<try>
bb99ac5 
Migrate `run-make/c-link-to-rust-staticlib` to `rmake`

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: dist-x86_64-freebsd
@bors
Copy link
Contributor

bors commented May 14, 2024

☀️ Try build successful - checks-actions
Build commit: bb99ac5 (bb99ac56df05c0b1af9ab7e1d78a9ddd98705f46)

@jieyouxu
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented May 14, 2024

📌 Commit b1e5e51 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 14, 2024
jieyouxu added a commit to jieyouxu/rust that referenced this pull request May 14, 2024
@jieyouxu
Rollup merge of rust-lang#125027 - Oneirical:c-test-with-remove, r=ji…
e52aa02 
…eyouxu

Migrate `run-make/c-link-to-rust-staticlib` to `rmake`

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: dist-x86_64-freebsd
@jieyouxu jieyouxu mentioned this pull request May 14, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request May 14, 2024
@bors
Auto merge of rust-lang#125131 - jieyouxu:rollup-oqprchr, r=jieyouxu
7cd7f2d 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#124746 (`rustc --explain E0582` additional example)
 - rust-lang#124975 (Use an helper to move the files)
 - rust-lang#125027 (Migrate `run-make/c-link-to-rust-staticlib` to `rmake`)
 - rust-lang#125084 (`rustc_hir_typeck`: Account for `skipped_ref_pats` in `expr_use_visitor`)
 - rust-lang#125104 (Migrate `run-make/no-cdylib-as-rdylib` to `rmake`)

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

bors commented May 14, 2024

⌛ Testing commit b1e5e51 with merge 5107b5c...

bors added a commit to rust-lang-ci/rust that referenced this pull request May 14, 2024
@bors
Auto merge of rust-lang#125027 - Oneirical:c-test-with-remove, r=jiey…
5107b5c 
…ouxu

Migrate `run-make/c-link-to-rust-staticlib` to `rmake`

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: dist-x86_64-freebsd
@bors
Copy link
Contributor

bors commented May 14, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 14, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 15, 2024

📌 Commit 91a3f04 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 15, 2024
@fmease fmease mentioned this pull request May 15, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 15, 2024
@bors
Auto merge of rust-lang#125144 - fmease:rollup-4uft293, r=fmease
ade234d 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#124307 (Optimize character escaping.)
 - rust-lang#124975 (Use an helper to move the files)
 - rust-lang#125027 (Migrate `run-make/c-link-to-rust-staticlib` to `rmake`)
 - rust-lang#125038 (Invert comparison in `uN::checked_sub`)
 - rust-lang#125104 (Migrate `run-make/no-cdylib-as-rdylib` to `rmake`)
 - rust-lang#125137 (MIR operators: clarify Shl/Shr handling of negative offsets)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2804d42 into rust-lang:master May 15, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 15, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 15, 2024
@rust-timer
Unrolled build for rust-lang#125027
e621421 
Rollup merge of rust-lang#125027 - Oneirical:c-test-with-remove, r=jieyouxu

Migrate `run-make/c-link-to-rust-staticlib` to `rmake`

Part of rust-lang#121876.

r? `@jieyouxu`
@Oneirical Oneirical deleted the c-test-with-remove branch May 15, 2024 15:01
celinval added a commit to celinval/rust-dev that referenced this pull request Jun 4, 2024
@github-actions @celinval @zhassan-aws
Automatic toolchain upgrade to nightly-2024-05-16 (rust-lang#3189)
695bdfc 
Update Rust toolchain from nightly-2024-05-15 to nightly-2024-05-16
without any other source changes.
This is an automatically generated pull request. If any of the CI checks
fail, manual intervention is required. In such a case, review the
changes at https://github.com/rust-lang/rust from
rust-lang@8387315
up to
rust-lang@1871252.
The log for this commit range is:
rust-lang@1871252fc8 Auto merge of
rust-lang#125164 - fmease:rollup-s5vwzlg, r=fmease
rust-lang@734a109998 Rollup merge of
rust-lang#125159 - fmease:allow-unauth-labels-l-pg-z, r=jieyouxu
rust-lang@601e5d199f Rollup merge of
rust-lang#125154 - FractalFir:fnabi_doc, r=compiler-errors
rust-lang@09156291e5 Rollup merge of
rust-lang#125146 - Oneirical:panic-impl, r=jieyouxu
rust-lang@80f991e09b Rollup merge of
rust-lang#125142 - GuillaumeGomez:migrate-rustdoc-themes, r=jieyouxu
rust-lang@c5b17ec9d2 Rollup merge of
rust-lang#125003 - RalfJung:aligned_alloc, r=cuviper
rust-lang@257d222e4b Improved the
documentation of the FnAbi struct
rust-lang@72a48fc68c Allow
unauthenticated users to modify `L-*`, `PG-*` and `-Z*` labels
rust-lang@b21b74b5e6 Auto merge of
rust-lang#125134 - compiler-errors:negative-traits-are-not-notable, r=fmease
rust-lang@a7484d2e49 fix tidy
rust-lang@cae17ff42b rewrite
panic-impl-transitive
rust-lang@ade234d574 Auto merge of
rust-lang#125144 - fmease:rollup-4uft293, r=fmease
rust-lang@8d38f2fb11 Rollup merge of
rust-lang#125137 - RalfJung:mir-sh, r=scottmcm
rust-lang@2659ff3882 Rollup merge of
rust-lang#125104 - Oneirical:test6, r=jieyouxu
rust-lang@4f7d9d4ad8 Rollup merge of
rust-lang#125038 - ivan-shrimp:checked_sub, r=joboet
rust-lang@2804d4223b Rollup merge of
rust-lang#125027 - Oneirical:c-test-with-remove, r=jieyouxu
rust-lang@2e70bea168 Rollup merge of
rust-lang#124975 - lu-zero:move_file, r=clubby789
rust-lang@3873a74f8a Rollup merge of
rust-lang#124307 - reitermarkus:escape-debug-size-hint-inline, r=joboet
rust-lang@3cb0030fe9 Auto merge of
rust-lang#123413 - petrochenkov:delegmulti2, r=fmease
rust-lang@c765480efe Migrate
`run-make/rustdoc-themes` to new rmake
rust-lang@c87ae947eb Add new `htmldocck`
function to `run-make-support`
rust-lang@a71c3ffce9 Auto merge of
rust-lang#125032 - compiler-errors:crash-dump-dir, r=onur-ozkan
rust-lang@0afd50e852 MIR operators:
clarify Shl/Shr handling of negative offsets
rust-lang@44fa5fd39a Auto merge of
rust-lang#125136 - matthiaskrgr:rollup-ljm15m3, r=matthiaskrgr
rust-lang@5f1a120ee5 Rollup merge of
rust-lang#125135 - chenyukang:yukang-fix-116502, r=compiler-errors
rust-lang@f7c2934420 Rollup merge of
rust-lang#125132 - mejrs:diag, r=compiler-errors
rust-lang@a8ff937b07 Rollup merge of
rust-lang#125108 - Zalathar:info-bitmap-bytes, r=nnethercote
rust-lang@03ff673dcc Rollup merge of
rust-lang#124990 - fmease:expand-weak-aliases-within-cts, r=compiler-errors
rust-lang@75895f59b0 Fix the dedup error
because of spans from suggestion
rust-lang@9e7aff7945 Auto merge of
rust-lang#125031 - Oneirical:dynamic-libs, r=jieyouxu
rust-lang@8994840f7e rustdoc: Negative
impls are not notable
rust-lang@91a3f04a3f fix the test
rust-lang@0160bff4b1 Auto merge of
rust-lang#125084 - Jules-Bertholet:fix-125058, r=Nadrieril
rust-lang@c30b41012d delegation:
Implement list delegation
rust-lang@18d7411719 Add
`on_unimplemented" typo suggestions
rust-lang@81f7e54962 Port issue-11908 to
rmake
rust-lang@1f61cc3078 port
no-cdylib-as-rdylib test
rust-lang@b1e5e5161a remove cxx_flags
rust-lang@1f5837ae25 rewrite
c-link-to-rust-staticlib
rust-lang@5cc020d3df avoid using
aligned_alloc; posix_memalign is better-behaved
rust-lang@c81be68fb4 coverage: Remove
confusing comments from `CoverageKind`
rust-lang@bfadc3a9b9 coverage:
`CoverageIdsInfo::mcdc_bitmap_bytes` is never needed
rust-lang@fe8f66e4bc `rustc_hir_typeck`:
Account for `skipped_ref_pats` in `expr_use_visitor`
rust-lang@4db00fe229 Use an helper to
move the files
rust-lang@7fde7308bf reverse condition in
`uN::checked_sub`
rust-lang@848f3c2c6e Make crashes dump
mir to build dir
rust-lang@35a5be2833 Also expand weak
alias tys inside consts inside `expand_weak_alias_tys`
rust-lang@4edf12d33e Improve escape
methods.
rust-lang@16981ba406 Avoid panicking
branch in `EscapeIterInner`.
rust-lang@e3fc97be2b Inline
`EscapeDebug::size_hint`.

Co-authored-by: celinval <[email protected]>
Co-authored-by: Zyad Hassan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu left review comments

Assignees

@jieyouxu jieyouxu

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
Oxidizing run-make tests
Status: Done
Milestone
1.80.0
Development

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