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 remap-path-prefix, debug-assertions and emit-stack-sizes run-make tests to rmake #126801

Merged
merged 4 commits into from
Jun 29, 2024

Conversation

Oneirical
Copy link
Contributor

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

Needs OSX/MSVC try jobs.

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

@rustbot
Copy link
Collaborator

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

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

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@Kobzol
Copy link
Contributor

Kobzol commented Jun 21, 2024

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 21, 2024
Migrate `remap-path-prefix`, `debug-assertions` and `emit-stack-sizes` `run-make` tests to rmake

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

Needs OSX/MSVC try jobs.

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

bors commented Jun 21, 2024

⌛ Trying commit 2931afd with merge 578c14a...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Jun 21, 2024

💔 Test failed - checks-actions

@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 21, 2024
@Oneirical
Copy link
Contributor Author

The only change made was restoring the ignore-directives previously featured in the Makefile test, with added Reason comment.

@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 25, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Jun 27, 2024

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 27, 2024
Migrate `remap-path-prefix`, `debug-assertions` and `emit-stack-sizes` `run-make` tests to rmake

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

Needs OSX/MSVC try jobs.

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

bors commented Jun 27, 2024

⌛ Trying commit 2baf8ed with merge 7870913...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Jun 27, 2024

💔 Test failed - checks-actions

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

rustbot commented Jun 28, 2024

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@Oneirical
Copy link
Contributor Author

Oneirical commented Jun 28, 2024

Yeah, let's add bstr to run-make-support, it doesn't add any new dependencies. With bstr, the rmeta check function becomes something like assert!(BString::from(slice).replace(b"\\", b"/").contains_str(slice)).

I just gave it a shot. Though this is a temporary solution, I'd like to make a new PR after this one that replaces all instances of invalid_utf8_contains with a bstr rework, with optional normalization.

@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 28, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Jun 28, 2024

Thanks! I assume that remap-path-prefix still fails on Windows?

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 28, 2024
Migrate `remap-path-prefix`, `debug-assertions` and `emit-stack-sizes` `run-make` tests to rmake

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

Needs OSX/MSVC try jobs.

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

bors commented Jun 28, 2024

⌛ Trying commit 2e1fd8f with merge 00da98a...

@Oneirical
Copy link
Contributor Author

Thanks! I assume that remap-path-prefix still fails on Windows?

I don't know, the normalization-backslash fix hasn't been tried yet. We're about to see.

@bors
Copy link
Contributor

bors commented Jun 28, 2024

☀️ Try build successful - checks-actions
Build commit: 00da98a (00da98a34f9d169c5bea8e0bb814f31245b08a71)

tests/run-make/remap-path-prefix/rmake.rs Outdated Show resolved Hide resolved
@Kobzol
Copy link
Contributor

Kobzol commented Jun 28, 2024

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Jun 28, 2024

📌 Commit 1795082 has been approved by Kobzol

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

r? Kobzol

@rustbot rustbot assigned Kobzol and unassigned jieyouxu Jun 29, 2024
@bors
Copy link
Contributor

bors commented Jun 29, 2024

⌛ Testing commit 1795082 with merge d1b7355...

@bors
Copy link
Contributor

bors commented Jun 29, 2024

☀️ Test successful - checks-actions
Approved by: Kobzol
Pushing d1b7355 to master...

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

Finished benchmarking commit (d1b7355): 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 8.2%)

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)
8.2% [7.8%, 8.5%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 698.422s -> 697.982s (-0.06%)
Artifact size: 324.47 MiB -> 324.48 MiB (0.00%)

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)
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

7 participants