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 print-target-list to rmake and print-calling-convention to ui-test #127877

Merged
merged 3 commits into from
Aug 4, 2024
Merged

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

merged 3 commits into from
Aug 4, 2024

Conversation

Rejyr
Copy link
Contributor

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

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
Copy link
Collaborator

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

@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
Copy link
Contributor

tgross35 commented Jul 17, 2024 •
edited
Loading

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
@jieyouxu jieyouxu mentioned this pull request Jul 18, 2024
Closed
jieyouxu
jieyouxu requested changes Jul 18, 2024
View reviewed changes
tests/run-make/print-calling-conventions/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/print-cfg/rmake.rs Show resolved Hide resolved
tests/run-make/print-target-list/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/print-target-list/rmake.rs Show resolved Hide resolved
tests/run-make/print-target-list/rmake.rs Show resolved Hide resolved
@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
Copy link
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
Open
@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
Copy link
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
Copy link
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
Copy link
Contributor

bors commented Jul 25, 2024

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

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 3, 2024
@bors
Auto merge of rust-lang#128073 - jieyouxu:exp-print-target-list, r=<try>
6e9f3ee 
[EXPERIMENTAL] try to see how to make `print-target-list` pass

Experiments for rust-lang#127877.

r? `@ghost`

try-job: x86_64-gnu-llvm-18
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 3, 2024
@bors
Auto merge of rust-lang#128073 - jieyouxu:exp-print-target-list, r=<try>
6111850 
[EXPERIMENTAL] try to see how to make `print-target-list` pass

Experiments for rust-lang#127877.

r? `@ghost`

try-job: x86_64-gnu-llvm-18
jieyouxu
jieyouxu requested changes Aug 3, 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.

I finally found out why we were struggling...

tests/run-make/print-target-list/Makefile Show resolved Hide resolved
tests/run-make/print-target-list/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/print-target-list/rmake.rs Outdated Show resolved Hide resolved
@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
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.

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

@jieyouxu
Copy link
Member

jieyouxu commented Aug 4, 2024

@bors try

@bors
Copy link
Contributor

bors commented Aug 4, 2024

⌛ Trying commit 36cf385 with merge cb916b6...

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 4, 2024
@bors
Auto merge of rust-lang#127877 - Rejyr:migrate-print-rmake, r=<try>
cb916b6 
Migrate `print-target-list` to `rmake` and  `print-calling-convention` to ui-test

Part of rust-lang#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
@bors
Copy link
Contributor

bors commented Aug 4, 2024

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

@jieyouxu
Copy link
Member

jieyouxu commented Aug 4, 2024

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Aug 4, 2024

📌 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
Copy link
Contributor

bors commented Aug 4, 2024

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

@bors
Copy link
Contributor

bors commented Aug 4, 2024

☀️ 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
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 4, 2024
This was referenced Aug 4, 2024
Merged
Merged
@rust-timer
Copy link
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
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