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

Change how runmake v2 tests are executed #126097

Merged
merged 9 commits into from
Jun 8, 2024

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Jun 6, 2024

This PR makes execution of v2 runmake tests more sane, by executing each test in a temporary directory by default, rather than running it inside tests/run-make. This will have.. a lot of conflicts.

Fixes: #126080
Closes #125726, because it removes tmp_dir, lol.

r? @jieyouxu

try-job: x86_64-msvc

@rustbot rustbot added 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 6, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 6, 2024

Some changes occurred in src/tools/compiletest

cc @jieyouxu

The run-make-support library was changed

cc @jieyouxu

Some changes occurred in run-make tests.

cc @jieyouxu

@rust-log-analyzer

This comment has been minimized.

@Kobzol Kobzol marked this pull request as draft June 6, 2024 20:28
@bors
Copy link
Contributor

bors commented Jun 7, 2024

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

@Kobzol Kobzol marked this pull request as ready for review June 7, 2024 09:29
@Kobzol
Copy link
Contributor Author

Kobzol commented Jun 7, 2024

This is now ready for a review (best reviewed commit-by-commit, of course).

@rustbot ready

@rust-log-analyzer

This comment has been minimized.

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.

Love the changes, takes away a lot of visual noise in the test.

src/tools/compiletest/src/runtest.rs Outdated Show resolved Hide resolved
src/tools/run-make-support/src/lib.rs Show resolved Hide resolved
tests/run-make/c-link-to-rust-dylib/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/const-prop-lint/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/CURRENT_RUSTC_VERSION/rmake.rs Show resolved Hide resolved
tests/run-make/notify-all-emit-artifacts/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/notify-all-emit-artifacts/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/rustdoc-scrape-examples-macros/rmake.rs Outdated Show resolved Hide resolved
@jieyouxu
Copy link
Member

jieyouxu commented Jun 7, 2024

Changes look good, only have minor non-blocking nits, feel free to r=me with or without addressing them. I don't know if the cwd() nits are fixed by the small refactoring PR, the review UI makes it a bit hard to tell.

@Kobzol
Copy link
Contributor Author

Kobzol commented Jun 7, 2024

Fixed the nits (apart from the command_output, because that requires a bit more work across run-make-support, we talked about this before - adding some custom Output struct for easy stdout/stderr asserting etc.). I also included one more commit based on the rust lib path cleanup, as we no longer need two functions for name/path of static/dynamic/rlib libraries.

Let me know if the last two commits are OK for you.

@bors rollup=never

@jieyouxu
Copy link
Member

jieyouxu commented Jun 7, 2024

Looks good, r=me after CI is green

@Kobzol
Copy link
Contributor Author

Kobzol commented Jun 7, 2024

@bors r=jieyouxu

@bors
Copy link
Contributor

bors commented Jun 7, 2024

📌 Commit ca583cb has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 7, 2024
@bors
Copy link
Contributor

bors commented Jun 8, 2024

⌛ Testing commit b10a404 with merge 2c5647e...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 8, 2024
Change how runmake v2 tests are executed

This PR makes execution of v2 runmake tests more sane, by executing each test in a temporary directory by default, rather than running it inside `tests/run-make`. This will have.. a lot of conflicts.

Fixes: rust-lang#126080
Closes rust-lang#125726, because it removes `tmp_dir`, lol.

r? `@jieyouxu`

try-job: x86_64-msvc
@Noratrieb
Copy link
Member

@bors r-
bors what the hell are you doing are you are testing #125966 (comment) already

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 8, 2024
@Noratrieb
Copy link
Member

oh this is supposed to be a try build... the queue disagrees :)

@BoxyUwU
Copy link
Member

BoxyUwU commented Jun 8, 2024

@pietroalbini commanded me to:
@bors retry

@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 Jun 8, 2024
@Noratrieb
Copy link
Member

it's not in the queue, so
@rustbot author

@rustbot rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 8, 2024
@Noratrieb Noratrieb removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 8, 2024
@bors
Copy link
Contributor

bors commented Jun 8, 2024

☀️ Try build successful - checks-actions
Build commit: 2c5647e (2c5647e646f650e4fb235da3ec3f715a9a88e047)

@Kobzol
Copy link
Contributor Author

Kobzol commented Jun 8, 2024

@bors r=jieyouxu

@bors
Copy link
Contributor

bors commented Jun 8, 2024

📌 Commit b10a404 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 Jun 8, 2024
@bors
Copy link
Contributor

bors commented Jun 8, 2024

⌛ Testing commit b10a404 with merge cfdb617...

@bors
Copy link
Contributor

bors commented Jun 8, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 8, 2024
@bors bors merged commit cfdb617 into rust-lang:master Jun 8, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 8, 2024
@Kobzol Kobzol deleted the runmake-change-cwd branch June 8, 2024 17:33
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (cfdb617): 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.4%)

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)
2.4% [2.4%, 2.4%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.4% [2.4%, 2.4%] 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: missing data
Artifact size: 319.76 MiB -> 319.74 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Status: Done
8 participants