Skip to content

Conversation

Zalathar
Copy link
Contributor

Did you know that bootstrap didn't support ./x check compiletest? Well, now it does!

Manually add "compiletest" to your rust-analyzer.check.overrideCommand check command to get error/warning integration when modifying compiletest.

@Zalathar Zalathar added the A-compiletest Area: The compiletest test runner label Dec 28, 2024
@rustbot
Copy link
Collaborator

rustbot commented Dec 28, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
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 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 Dec 28, 2024
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.

... Huh, this never occurred to me. Thanks!

@jieyouxu
Copy link
Member

r? jieyouxu @bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 28, 2024

📌 Commit c1c2d85 has been approved by jieyouxu

It is now in the queue for this repository.

@rustbot rustbot assigned jieyouxu and unassigned Mark-Simulacrum Dec 28, 2024
@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 Dec 28, 2024
@bors
Copy link
Collaborator

bors commented Dec 28, 2024

⌛ Testing commit c1c2d85 with merge b76036c...

@bors
Copy link
Collaborator

bors commented Dec 29, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 29, 2024
@bors bors merged commit b76036c into rust-lang:master Dec 29, 2024
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 29, 2024
@Zalathar Zalathar deleted the check-compiletest branch December 29, 2024 01:17
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b76036c): 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 (secondary -2.1%)

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)
- - 0
Improvements ✅
(secondary)
-2.1% [-3.5%, -0.8%] 5
All ❌✅ (primary) - - 0

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: 763.109s -> 762.815s (-0.04%)
Artifact size: 325.47 MiB -> 325.46 MiB (-0.00%)

Zalathar added a commit to Zalathar/rust that referenced this pull request Dec 29, 2024
bootstrap: Fix `./x check bootstrap` by moving `shared_helpers::tests`

Running `./x check bootstrap` currently doesn't work, because it builds the bootstrap shim binaries with `cfg(test)`, and those binaries can't find a `tests` submodule when they include `shared_helpers.rs` via `#[path]`.

This PR fixes that by taking the tests module and moving it to `super::tests::shared_helpers_tests` instead.

(The extra `tests` submodule prevents tidy from complaining about unit tests that aren't in a dedicated tests module.)

---

It would be nice to also run `./x check bootstrap compiletest` in CI, so that this and rust-lang#134848 don't regress, but I didn't want to bundle that change with this fix.
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 29, 2024
Rollup merge of rust-lang#134883 - Zalathar:shared-helpers, r=clubby789

bootstrap: Fix `./x check bootstrap` by moving `shared_helpers::tests`

Running `./x check bootstrap` currently doesn't work, because it builds the bootstrap shim binaries with `cfg(test)`, and those binaries can't find a `tests` submodule when they include `shared_helpers.rs` via `#[path]`.

This PR fixes that by taking the tests module and moving it to `super::tests::shared_helpers_tests` instead.

(The extra `tests` submodule prevents tidy from complaining about unit tests that aren't in a dedicated tests module.)

---

It would be nice to also run `./x check bootstrap compiletest` in CI, so that this and rust-lang#134848 don't regress, but I didn't want to bundle that change with this fix.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-compiletest Area: The compiletest test runner 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
None yet
Development

Successfully merging this pull request may close these issues.

6 participants