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/comment-section to rmake.rs #126534

Merged
merged 1 commit into from
Jun 20, 2024
Merged

Migrate run-make/comment-section to rmake.rs #126534

merged 1 commit into from
Jun 20, 2024

Conversation

Rejyr
Copy link
Contributor

@Rejyr Rejyr commented Jun 16, 2024 •
edited by jieyouxu
Loading

Part of #121876.

r? @jieyouxu

try-job: x86_64-msvc
try-job: aarch64-gnu
try-job: aarch64-apple

@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 Jun 16, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 16, 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

Rejyr
Rejyr commented Jun 16, 2024
View reviewed changes
src/tools/run-make-support/src/llvm.rs Outdated Show resolved Hide resolved
src/tools/run-make-support/src/llvm.rs Outdated Show resolved Hide resolved
@Kobzol Kobzol mentioned this pull request Jun 16, 2024
Open
@Rejyr Rejyr force-pushed the comment-section-migration branch from 9d6863e to a3ce891 Compare June 16, 2024 12:30
jieyouxu
jieyouxu reviewed Jun 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 for the PR. I've left some review comments.

src/tools/run-make-support/src/llvm.rs Outdated Show resolved Hide resolved
src/tools/run-make-support/src/llvm.rs Outdated Show resolved Hide resolved
tests/run-make/comment-section/main.rs Outdated Show resolved Hide resolved
tests/run-make/comment-section/rmake.rs Show resolved Hide resolved
tests/run-make/comment-section/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/comment-section/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/comment-section/rmake.rs Outdated Show resolved Hide resolved
@jieyouxu
Copy link
Member

@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 Jun 16, 2024
@Rejyr Rejyr force-pushed the comment-section-migration branch from a3ce891 to 12d8ccf Compare June 16, 2024 19:03
@jieyouxu
Copy link
Member

Running a subset of full CI jobs just to be sure.
@bors try

@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-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 16, 2024
@bors
Copy link
Contributor

bors commented Jun 16, 2024

⌛ Trying commit 12d8ccf with merge 7fa8271...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 16, 2024
@bors
Auto merge of rust-lang#126534 - Rejyr:comment-section-migration, r=<…
7fa8271 
…try>

Migrate `run-make/comment-section` to `rmake.rs`

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: dist-aarch64-linux
try-job: dist-armhf-linux
try-job: x86_64-gnu-llvm-18
try-job: test-various
try-job: dist-various-1
@jieyouxu
Copy link
Member

@bors rollup=iffy (checks object file contents, possibly fragile)

@bors
Copy link
Contributor

bors commented Jun 16, 2024

☀️ Try build successful - checks-actions
Build commit: 7fa8271 (7fa8271da35084ee07e37d15cf50815525c99643)

@jieyouxu
Copy link
Member

Looks good, thanks!
@bors r+

@bors
Copy link
Contributor

bors commented Jun 16, 2024

📌 Commit 12d8ccf 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 Jun 16, 2024
@bors
Copy link
Contributor

bors commented Jun 16, 2024

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout comment-section-migration (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self comment-section-migration --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
Removing tests/run-make/comment-section/Makefile
Auto-merging src/tools/tidy/src/allowed_run_make_makefiles.txt
Auto-merging src/tools/run-make-support/src/llvm.rs
CONFLICT (content): Merge conflict in src/tools/run-make-support/src/llvm.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 16, 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 Jun 18, 2024
@jieyouxu
Copy link
Member

I'll take a closer look tmrw

@Oneirical Oneirical mentioned this pull request Jun 18, 2024
Merged
@Rejyr
Copy link
Contributor Author

Rejyr commented Jun 19, 2024

@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 Jun 19, 2024
@jieyouxu
Copy link
Member

jieyouxu commented Jun 19, 2024 •
edited
Loading

@Rejyr can you leave a // FIXME(jieyouxu): check cross-compile setup in the test and add a //@ ignore-cross-compile for now? I am suspecting this is a run-make setup problem in cross-compilation scenarios but I don't want to block this PR on that.

@Rejyr Rejyr force-pushed the comment-section-migration branch from e601c8d to d6ff779 Compare June 19, 2024 19:39
@Rejyr Rejyr force-pushed the comment-section-migration branch from d6ff779 to f44494c Compare June 19, 2024 19:59
@jieyouxu
Copy link
Member

@bors try

@bors
Copy link
Contributor

bors commented Jun 19, 2024

⌛ Trying commit f44494c with merge dfa9504...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 19, 2024
@bors
Auto merge of rust-lang#126534 - Rejyr:comment-section-migration, r=<…
dfa9504 
…try>

Migrate `run-make/comment-section` to `rmake.rs`

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: x86_64-msvc
try-job: aarch64-gnu
try-job: aarch64-apple
@bors
Copy link
Contributor

bors commented Jun 19, 2024

☀️ Try build successful - checks-actions
Build commit: dfa9504 (dfa9504e85cb0d289c3a963b4542c1ae938533e4)

@jieyouxu
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jun 19, 2024

📌 Commit f44494c 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 Jun 19, 2024
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 19, 2024
@jieyouxu
Rollup merge of rust-lang#126534 - Rejyr:comment-section-migration, r…
58db9d0 
…=jieyouxu

Migrate `run-make/comment-section` to `rmake.rs`

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: x86_64-msvc
try-job: aarch64-gnu
try-job: aarch64-apple
@jieyouxu jieyouxu mentioned this pull request Jun 19, 2024
Closed
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 19, 2024
@jieyouxu
Rollup merge of rust-lang#126534 - Rejyr:comment-section-migration, r…
de12d6b 
…=jieyouxu

Migrate `run-make/comment-section` to `rmake.rs`

Part of rust-lang#121876.

r? ``@jieyouxu``

try-job: x86_64-msvc
try-job: aarch64-gnu
try-job: aarch64-apple
@jieyouxu jieyouxu mentioned this pull request Jun 19, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 20, 2024
@bors
Auto merge of rust-lang#126716 - jieyouxu:rollup-yjml58m, r=jieyouxu
400a1b1 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#126095 (Migrate `link-args-order`, `ls-metadata` and `lto-readonly-lib` `run-make` tests to `rmake`)
 - rust-lang#126534 (Migrate `run-make/comment-section` to `rmake.rs`)
 - rust-lang#126620 (Actually taint InferCtxt when a fulfillment error is emitted)
 - rust-lang#126629 (Migrate `run-make/compressed-debuginfo` to `rmake.rs`)
 - rust-lang#126644 (Rewrite `extern-flag-rename-transitive`. `debugger-visualizer-dep-info`, `metadata-flag-frobs-symbols`, `extern-overrides-distribution` and `forced-unwind-terminate-pof` `run-make` tests to rmake)
 - rust-lang#126650 (Rename a bunch of things in the new solver and `rustc_type_ir`)
 - rust-lang#126698 (Migrate `unknown-mod-stdin`, `issue-68794-textrel-on-minimal-lib`, `raw-dylib-cross-compilation` and `used-cdylib-macos` `run-make` tests to rmake)
 - rust-lang#126703 (reword the hint::blackbox non-guarantees)
 - rust-lang#126708 (Minimize `can_begin_literal_maybe_minus` usage)

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

bors commented Jun 20, 2024

⌛ Testing commit f44494c with merge 54fcd5b...

@bors
Copy link
Contributor

bors commented Jun 20, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 20, 2024
@bors bors merged commit 54fcd5b into rust-lang:master Jun 20, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 20, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (54fcd5b): 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%, secondary -3.8%)

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)		 -3.8% [-4.6%, -3.1%] 2
All ❌✅ (primary) -2.3% [-2.3%, -2.3%] 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: 691.149s -> 690.827s (-0.05%)
Artifact size: 323.84 MiB -> 323.74 MiB (-0.03%)

@Rejyr Rejyr deleted the comment-section-migration branch June 20, 2024 10:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kobzol Kobzol Kobzol left review comments

@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.81.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Rejyr @rustbot @jieyouxu @bors @rust-timer @Kobzol