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 split-debuginfo run-make test to rmake #128754

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate split-debuginfo run-make test to rmake #128754

wants to merge 1 commit into from
+588 −372

Conversation

Oneirical
Copy link
Contributor

@Oneirical Oneirical commented Aug 6, 2024 •
edited
Loading

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

Possibly the most epic test rewrite yet in this project.

  • Documentation-wise, this may need to be improved? The original test had many repeated comments, but I feel like the struct form of this rewrite makes it self-documenting in that aspect (example: lines like .dwo never created). Tell me if anything should get explanatory comments, especially in the massive run_test function.
    • Maybe at least the name of the various Makefile sections could be interesting.

Please try:

try-job: test-various
try-job: aarch64-apple

@rustbot
Copy link
Collaborator

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

rustbot commented Aug 6, 2024

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

The run-make-support library was changed

cc @jieyouxu

@Oneirical
Copy link
Contributor Author

@rustbot blocked (#128410)

@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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 6, 2024
@Oneirical Oneirical force-pushed the master branch 2 times, most recently from 6c4d8bf to 07cef6f Compare August 6, 2024 20:45
@Kobzol Kobzol mentioned this pull request Aug 6, 2024
Open
@bors
Copy link
Contributor

bors commented Aug 7, 2024

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

@jieyouxu jieyouxu added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Aug 8, 2024
@jieyouxu
Copy link
Member

I won't have time to review this before our meeting tomorrow, I'll try to get to it tomorrow.

@Oneirical
Copy link
Contributor Author

I won't have time to review this before our meeting tomorrow, I'll try to get to it tomorrow.

Rust maintainers? Sleeping? What is this?

No rush, I am quite sure that there will not be any further test ports dependent on another one, so we can deal with each individual remaining case on its own.

@bors
Copy link
Contributor

bors commented Aug 16, 2024

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

jieyouxu
jieyouxu reviewed Sep 16, 2024
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks, I have some interim feedback.

tests/run-make/split-debuginfo/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/split-debuginfo/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/split-debuginfo/rmake.rs
Comment on lines +405 to +570
// Some non-Windows, non-Darwin platforms are not stable, and some are.
fn unstable_rustc() -> Rustc {
let mut compiler = rustc();
if !target().contains("linux") {
compiler.arg("-Zunstable-options");
}
Copy link
Member

Choose a reason for hiding this comment

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

Question: the impl here is for non-linux, it doesn't quite match up with the comment?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The comment is from the original Makefile:

# Some non-Windows, non-Darwin platforms are not stable, and some are.
ifeq ($(UNAME),Linux)
  UNSTABLEOPTS :=
else
  UNSTABLEOPTS := -Zunstable-options
endif

I am open to inverting the comment to read "Some non-Linux platforms are not stable, and some are."

tests/run-make/split-debuginfo/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/split-debuginfo/rmake.rs Show resolved Hide resolved
@jieyouxu jieyouxu 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 Sep 16, 2024
@Oneirical
Copy link
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 Sep 19, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
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-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)
Projects
Oxidizing run-make tests
Status: In progress
Milestone
No milestone
Development

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