Skip to content

Migrate print-target-list to rmake and print-calling-convention to ui-test - #127877

Merged
bors merged 3 commits into
rust-lang:masterfrom
rejyr:migrate-print-rmake
Aug 4, 2024
Merged

Migrate print-target-list to rmake and print-calling-convention to ui-test#127877
bors merged 3 commits into
rust-lang:masterfrom
rejyr:migrate-print-rmake

Conversation

@rejyr

@rejyr rejyr commented Jul 17, 2024 •
edited by jieyouxu
Loading

Copy link
Copy Markdown
Contributor

Part of #121876.

r? @jieyouxu

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

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

ghost commented Jul 17, 2024

Copy link
Copy Markdown
Collaborator

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

@rustbot rustbot added 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 17, 2024
@rejyr
rejyr force-pushed the migrate-print-rmake branch from 31c57e7 to 328c34f Compare July 17, 2024 21:29
@tgross35

ghost commented Jul 17, 2024 •
edited by tgross35
Loading

Copy link
Copy Markdown
Member

Could you add checks that the output has a trailing newline? Just since we have missed them before (https://github.com/rust-lang/rust/pull/127512/files)

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rejyr
rejyr force-pushed the migrate-print-rmake branch from bc5d27e to 65cab6f Compare July 17, 2024 23:06
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rejyr rejyr mentioned this pull request Jul 18, 2024
Closed
rejyr
rejyr commented Jul 18, 2024
View reviewed changes
Comment thread tests/run-make/print-target-list/rmake.rs
@jieyouxu jieyouxu mentioned this pull request Jul 18, 2024
Closed
jieyouxu
jieyouxu requested changes Jul 18, 2024
View reviewed changes
Comment thread tests/run-make/print-calling-conventions/rmake.rs Outdated
Comment thread tests/run-make/print-cfg/rmake.rs
Comment thread tests/run-make/print-target-list/rmake.rs Outdated
Comment thread tests/run-make/print-target-list/rmake.rs
Comment thread tests/run-make/print-target-list/rmake.rs
@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 18, 2024
@jieyouxu

ghost commented Jul 18, 2024

Copy link
Copy Markdown
Member

Marking this as blocked on the pending discussions in #127895.
@rustbot blocked (waiting for more info from #127895)

@rustbot rustbot added S-blocked Status: 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 18, 2024
@Kobzol Kobzol mentioned this pull request Jul 18, 2024
Closed
@rejyr
rejyr force-pushed the migrate-print-rmake branch from 65cab6f to a4259f6 Compare July 18, 2024 15:22
@rejyr rejyr changed the title Migrate print-calling-convention and print-target-list to rmake Migrate print-target-list to rmake and print-calling-convention to ui-test Jul 18, 2024
@jieyouxu

ghost commented Jul 18, 2024

Copy link
Copy Markdown
Member

@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jul 18, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
jieyouxu
jieyouxu reviewed Jul 19, 2024
View reviewed changes
Comment thread tests/run-make/print-target-list/rmake.rs
@jieyouxu

ghost commented Jul 19, 2024

Copy link
Copy Markdown
Member

@rustbot author

@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 19, 2024
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 20, 2024
@jieyouxu jieyouxu mentioned this pull request Jul 22, 2024
Closed
@bors

ghost 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
jieyouxu requested changes Aug 3, 2024
View reviewed changes

ghost 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.

I finally found out why we were struggling...

Comment thread tests/run-make/print-target-list/Makefile
Comment thread tests/run-make/print-target-list/rmake.rs Outdated
Comment thread tests/run-make/print-target-list/rmake.rs
@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 3, 2024
@rejyr
rejyr force-pushed the migrate-print-rmake branch from c38861b to 36cf385 Compare August 4, 2024 03:12
jieyouxu
jieyouxu approved these changes Aug 4, 2024
View reviewed changes

ghost 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.

Cool, I'll run a couple of try job to double-check.

@jieyouxu

ghost commented Aug 4, 2024

Copy link
Copy Markdown
Member

@bors try

@bors

ghost commented Aug 4, 2024

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 36cf385 with merge cb916b6...

@bors

ghost commented Aug 4, 2024

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-actions
Build commit: cb916b6 (cb916b6a99b6275c0044407fc7a8c9083a0a5c73)

@jieyouxu

ghost commented Aug 4, 2024

Copy link
Copy Markdown
Member

@bors r+ rollup=iffy

@bors

ghost commented Aug 4, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 36cf385 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 4, 2024
@bors

ghost commented Aug 4, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 36cf385 with merge 58fb508...

@bors

ghost commented Aug 4, 2024

Copy link
Copy Markdown
Collaborator

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

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

ghost commented Aug 4, 2024

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (58fb508): 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.3%)

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

Cycles

Results (primary 1.3%)

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

Binary size

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

Bootstrap: 758.686s -> 757.27s (-0.19%)
Artifact size: 336.83 MiB -> 336.80 MiB (-0.01%)

@rejyr
rejyr deleted the migrate-print-rmake branch August 4, 2024 13:56
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 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
Oxidizing run-make tests
Status: Done

Milestone

1.82.0

Development

Successfully merging this pull request may close these issues.

7 participants

@rejyr @rustbot @tgross35 @rust-log-analyzer @jieyouxu @bors @rust-timer