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.

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

Migrate 9 more very similar FFI run-make tests to rmake #127663

Merged
merged 9 commits into from
Jul 20, 2024

Conversation

Oneirical
Copy link
Contributor

@Oneirical Oneirical commented Jul 12, 2024

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

For the tracking issue:

  • return-non-c-like-enum-from-c
  • pass-non-c-like-enum-to-c
  • c-static-dylib
  • c-static-rlib
  • extern-fn-generic
  • extern-fn-with-union
  • lto-no-link-whole-rlib
  • linkage-attr-on-static
  • issue-28595

@rustbot
Copy link
Collaborator

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

rustbot commented Jul 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

@rust-log-analyzer

This comment has been minimized.

@Oneirical Oneirical force-pushed the fuzzy-testure branch 2 times, most recently from 56e301d to 55b9323 Compare July 12, 2024 20:09
@rust-log-analyzer

This comment has been minimized.

@jieyouxu
Copy link
Member

jieyouxu commented Jul 14, 2024

Question: should this be blocked on another PR that also introduces the build_native_lib helper?
@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 Jul 14, 2024
@Oneirical
Copy link
Contributor Author

Yes, it should be.
@rustbot blocked #126208

2024-07-12T21:01:28.3065014Z thread 'main' panicked at src/tools/compiletest/src/header.rs:47:41:
2024-07-12T21:01:28.3065873Z open test file to parse earlyprops: Os { code: 20, kind: NotADirectory, message: "Not a directory" }
2024-07-12T21:01:28.3066711Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

Also, this CI failure is VERY weird. It doesn't seem related to what this PR changes.

@rustbot rustbot added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 15, 2024
@Oneirical
Copy link
Contributor Author

@rustbot blocked (now on #127760)

@rust-log-analyzer

This comment has been minimized.

@jieyouxu
Copy link
Member

@rustbot author (pr was merged)

@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-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Jul 17, 2024
@bors
Copy link
Contributor

bors commented Jul 17, 2024

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

@Oneirical Oneirical changed the title Migrate 8 more very similar FFI run-make tests to rmake Migrate 9 more very similar FFI run-make tests to rmake Jul 17, 2024
@Oneirical
Copy link
Contributor Author

Just noticed it was failing because one of the files didn't get bundled with my commits. Please add issue-28595 in the tracking issue.

@Oneirical
Copy link
Contributor Author

@rustbot review

@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 Jul 17, 2024
@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 19, 2024
@Oneirical
Copy link
Contributor Author

@bors r=@jieyouxu
Fifth time's the charm?

@bors
Copy link
Contributor

bors commented Jul 19, 2024

📌 Commit fdc8d62 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 Jul 19, 2024
tgross35 added a commit to tgross35/rust that referenced this pull request Jul 20, 2024
Migrate 9 more very similar FFI `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).

For the tracking issue:

- return-non-c-like-enum-from-c
- pass-non-c-like-enum-to-c
- c-static-dylib
- c-static-rlib
- extern-fn-generic
- extern-fn-with-union
- lto-no-link-whole-rlib
- linkage-attr-on-static
- issue-28595
tgross35 added a commit to tgross35/rust that referenced this pull request Jul 20, 2024
Migrate 9 more very similar FFI `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).

For the tracking issue:

- return-non-c-like-enum-from-c
- pass-non-c-like-enum-to-c
- c-static-dylib
- c-static-rlib
- extern-fn-generic
- extern-fn-with-union
- lto-no-link-whole-rlib
- linkage-attr-on-static
- issue-28595
@bors
Copy link
Contributor

bors commented Jul 20, 2024

⌛ Testing commit fdc8d62 with merge 5069856...

@bors
Copy link
Contributor

bors commented Jul 20, 2024

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

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (5069856): 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 (primary -2.5%)

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)
- - 0
Improvements ✅
(primary)
-2.5% [-2.5%, -2.5%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.5% [-2.5%, -2.5%] 1

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: 771.36s -> 769.446s (-0.25%)
Artifact size: 328.85 MiB -> 328.90 MiB (0.02%)

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
Status: Done
Development

Successfully merging this pull request may close these issues.

6 participants