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.

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

Migrate issue-83112-incr-test-moved-file, type-mismatch-same-crate-name and issue-109934-lto-debuginfo run-make tests to rmake or ui #127538

Merged
merged 3 commits into from
Jul 11, 2024

Conversation

Oneirical
Copy link
Contributor

@Oneirical Oneirical commented Jul 9, 2024

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

I have noticed that the new UI test debuginfo-lto-alloc is outputting artifacts that aren't getting cleaned up because of its -C incremental. That might be the justification needed to keep it as a run-make test?

Try it on:

// try-job: test-various // previously passed
try-job: armhf-gnu
try-job: aarch64-apple
try-job: x86_64-msvc

@rustbot
Copy link
Collaborator

rustbot commented Jul 9, 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 9, 2024
@rustbot
Copy link
Collaborator

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

@Kobzol
Copy link
Contributor

Kobzol commented Jul 9, 2024

@bors try

@bors
Copy link
Contributor

bors commented Jul 9, 2024

⌛ Trying commit 2adfa14 with merge 1af7933...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 9, 2024
Migrate `issue-83112-incr-test-moved-file`, `type-mismatch-same-crate-name` and `issue-109934-lto-debuginfo` `run-make` tests to rmake or ui

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

I have noticed that the new UI test `debuginfo-lto-alloc` is outputting artifacts that aren't getting cleaned up because of its `-C incremental`. That might be the justification needed to keep it as a run-make test?

Try it on:

try-job: test-various
@bors
Copy link
Contributor

bors commented Jul 9, 2024

☀️ Try build successful - checks-actions
Build commit: 1af7933 (1af79339ef354004955a8edce7e1a949418d3cca)

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! The tests look reasonable, maybe add a remark in the lto test or not, at your discretion, then r=me if another battery of try-jobs come back green ^^

Copy link
Member

Choose a reason for hiding this comment

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

I have noticed that the new UI test debuginfo-lto-alloc is outputting artifacts that aren't getting cleaned up because of its -C incremental. That might be the justification needed to keep it as a run-make test?

If that's the case, let's keep it as a rmake.rs test for now, can you please leave a remark about your finding in case someone tries to port it to ui tests? (We could try to fix ui tests not cleaning this up in another PR, but I'm also fine with leaving it as a rmake.rs test if it does something that's "more special" than ui tests, i.e. I don't want to shoehorn it into ui tests if rmake.rs is less friction).

@jieyouxu
Copy link
Member

@bors delegate+ (r=me if try jobs come back green)

@bors
Copy link
Contributor

bors commented Jul 10, 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

@jieyouxu
Copy link
Member

@bors try

@bors
Copy link
Contributor

bors commented Jul 10, 2024

⌛ Trying commit 2adfa14 with merge db5e3a2...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 10, 2024
Migrate `issue-83112-incr-test-moved-file`, `type-mismatch-same-crate-name` and `issue-109934-lto-debuginfo` `run-make` tests to rmake or ui

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

I have noticed that the new UI test `debuginfo-lto-alloc` is outputting artifacts that aren't getting cleaned up because of its `-C incremental`. That might be the justification needed to keep it as a run-make test?

Try it on:

// try-job: test-various // previously passed
try-job: armhf-gnu
try-job: aarch64-apple
try-job: x86_64-msvc
@bors
Copy link
Contributor

bors commented Jul 10, 2024

☀️ Try build successful - checks-actions
Build commit: db5e3a2 (db5e3a253c0d26497155d86fb733da457e073dd7)

@Oneirical
Copy link
Contributor Author

@bors r=@jieyouxu

@bors
Copy link
Contributor

bors commented Jul 10, 2024

📌 Commit 2adfa14 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 Jul 10, 2024
@jieyouxu
Copy link
Member

@bors r-

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 10, 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 Jul 10, 2024
@jieyouxu
Copy link
Member

jieyouxu commented Jul 10, 2024

@Oneirical sorry just to clarify, you said that the lto test has residual artifacts as a UI test, do you think we should keep it as a rmake.rs instead? I would be fine not converting it to a UI test and keeping it as a rmake.rs test if it has special handling that ordinary UI tests do not handle.

@Oneirical
Copy link
Contributor Author

@Oneirical sorry just to clarify, you said that the lto test has residual artifacts as a UI test, do you think we should keep it as a rmake.rs instead? I would be fine not converting it to a UI test and keeping it as a rmake.rs test if it has special handling that ordinary UI tests do not handle.

Sorry, I missed your upper review comment! I read it now.

When running the UI test locally, some files appear in my file tracker that aren't getting ignored by .gitignore. This would be inconsequential if compiletest resets the UI directory to its original state after the end of testing.

@jieyouxu
Copy link
Member

Oh okay cool ty
@bors r+

@bors
Copy link
Contributor

bors commented Jul 10, 2024

📌 Commit 2adfa14 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 Jul 10, 2024
@bors
Copy link
Contributor

bors commented Jul 11, 2024

⌛ Testing commit 2adfa14 with merge e1f45a1...

@bors
Copy link
Contributor

bors commented Jul 11, 2024

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

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

Finished benchmarking commit (e1f45a1): 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)

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

Cycles

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

Binary size

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

Bootstrap: 703.792s -> 705.402s (0.23%)
Artifact size: 328.53 MiB -> 328.86 MiB (0.10%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

6 participants