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 extern-flag-fun, incremental-debugger-visualiser and incremental-session-fail run-make tests to rmake.rs #126490

Merged
merged 3 commits into from
Jun 18, 2024
Merged

Migrate extern-flag-fun, incremental-debugger-visualiser and incremental-session-fail run-make tests to rmake.rs #126490

merged 3 commits into from
Jun 18, 2024

Conversation

Oneirical
Copy link
Contributor

@Oneirical Oneirical commented Jun 14, 2024 •
edited by jieyouxu
Loading

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

try-job: arm-android
try-job: armhf-gnu
try-job: test-various
try-job: x86_64-msvc
try-job: dist-i686-mingw

@rustbot
Copy link
Collaborator

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

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

@Kobzol Kobzol mentioned this pull request Jun 14, 2024
Open
@rust-log-analyzer

This comment has been minimized.

Sign in to view
jieyouxu
jieyouxu approved these changes 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, changes looks good to me in general, I just left some suggestions.

src/tools/run-make-support/src/lib.rs Outdated Show resolved Hide resolved
src/tools/run-make-support/src/lib.rs Outdated Show resolved Hide resolved
src/tools/run-make-support/src/lib.rs Outdated Show resolved Hide resolved
src/tools/run-make-support/src/lib.rs Outdated Show resolved Hide resolved
tests/run-make/extern-flag-fun/rmake.rs Show resolved Hide resolved
tests/run-make/extern-flag-fun/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/incremental-debugger-visualizer/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/incremental-debugger-visualizer/rmake.rs Show resolved Hide resolved
tests/run-make/incremental-debugger-visualizer/rmake.rs Outdated Show resolved Hide resolved
@jieyouxu
Copy link
Member

Huh, the incremental debugger visualizer test looks a bit sus to me, do all of the CI environments have suitable GDB? Let's find out:

@bors try

@jieyouxu
Copy link
Member

In any case, @bors rollup=iffy (relates to incremental tests and gdb, easy to fail in full CI)

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 16, 2024
@bors
Auto merge of rust-lang#126490 - Oneirical:testicide, r=<try>
eb51c63 
Migrate `extern-flag-fun`, `incremental-debugger-visualiser` and `incremental-session-fail` `run-make` tests to `rmake.rs`

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

try-job: arm-android
try-job: armhf-gnu
try-job: test-various
try-job: x86_64-msvc
try-job: dist-i686-mingw
@bors
Copy link
Contributor

bors commented Jun 16, 2024

⌛ Trying commit abf6b17 with merge eb51c63...

@jieyouxu
Copy link
Member

@rustbot author (for suggestions)

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

bors commented Jun 16, 2024

☀️ Try build successful - checks-actions
Build commit: eb51c63 (eb51c638f2d91c876f101136ae1c5f6a66ca8b10)

@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 Jun 17, 2024
jieyouxu
jieyouxu approved these changes Jun 17, 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, two tiny nits, then r=me.

src/tools/run-make-support/src/lib.rs Outdated Show resolved Hide resolved
src/tools/run-make-support/src/lib.rs Outdated Show resolved Hide resolved
@jieyouxu
Copy link
Member

@bors delegate+

@bors
Copy link
Contributor

bors commented Jun 17, 2024

✌️ @Oneirical, you can now approve this pull request!

If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu

@Oneirical
Copy link
Contributor Author

@bors r=@jieyouxu

@bors
Copy link
Contributor

bors commented Jun 17, 2024

📌 Commit cdfcc94 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 17, 2024
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 17, 2024
@jieyouxu
Rollup merge of rust-lang#126490 - Oneirical:testicide, r=jieyouxu
6dd6ad5 
Migrate `extern-flag-fun`, `incremental-debugger-visualiser` and `incremental-session-fail` `run-make` tests to `rmake.rs`

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

try-job: arm-android
try-job: armhf-gnu
try-job: test-various
try-job: x86_64-msvc
try-job: dist-i686-mingw
@jieyouxu jieyouxu mentioned this pull request Jun 17, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 17, 2024
@bors
Auto merge of rust-lang#126611 - jieyouxu:rollup-061kmhl, r=jieyouxu
cb74cba 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#126279 (Migrate `inaccessible-temp-dir`, `output-with-hyphens` and `issue-10971-temps-dir` `run-make` tests to `rmake`)
 - rust-lang#126437 (Migrate `issue-64153`, `invalid-staticlib` and `no-builtins-lto` `run-make` tests to `rmake`)
 - rust-lang#126490 (Migrate `extern-flag-fun`, `incremental-debugger-visualiser` and `incremental-session-fail` `run-make` tests to `rmake.rs`)
 - rust-lang#126500 (Migrate `error-found-staticlib-instead-crate`, `output-filename-conflicts-with-directory`, `output-filename-overwrites-input`, `native-link-modifier-verbatim-rustc` and `native-link-verbatim-linker` `run-make` tests to `rmake.rs` format)
 - rust-lang#126534 (Migrate `run-make/comment-section` to `rmake.rs`)

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

bors commented Jun 18, 2024

⌛ Testing commit cdfcc94 with merge 67cfc3a...

@bors
Copy link
Contributor

bors commented Jun 18, 2024

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

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

Finished benchmarking commit (67cfc3a): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.3% [-0.4%, -0.3%] 6
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.3% [-0.4%, -0.3%] 6

Max RSS (memory usage)

Results (primary 2.6%)

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)		 4.5% [4.5%, 4.6%] 2
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -1.4% [-1.4%, -1.4%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 2.6% [-1.4%, 4.6%] 3

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: 671.107s -> 671.082s (-0.00%)
Artifact size: 320.52 MiB -> 320.51 MiB (-0.00%)

@Oneirical Oneirical deleted the testicide branch June 18, 2024 13:48
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.81.0
Development

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