bootstrap: Fix ./x check bootstrap by moving shared_helpers::tests
#134883
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
|
Ran into this recently; thanks! r=me when green |
jieyouxu
reviewed
Dec 29, 2024
|
@bors r=clubby789 rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 29, 2024
Rollup of 5 pull requests Successful merges: - rust-lang#134799 (nits: Cleanups in `librustdoc::clean`) - rust-lang#134851 (docs: inline `alloc::ffi::c_str` types to `alloc::ffi`) - rust-lang#134869 (Bump compiler cc) - rust-lang#134876 (bootstrap: Consolidate the macros for declaring compiletest test suites) - rust-lang#134883 (bootstrap: Fix `./x check bootstrap` by moving `shared_helpers::tests`) r? `@ghost` `@rustbot` modify labels: rollup
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Running
./x check bootstrapcurrently doesn't work, because it builds the bootstrap shim binaries withcfg(test), and those binaries can't find atestssubmodule when they includeshared_helpers.rsvia#[path].This PR fixes that by taking the tests module and moving it to
super::tests::shared_helpers_testsinstead.(The extra
testssubmodule 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 compiletestin CI, so that this and #134848 don't regress, but I didn't want to bundle that change with this fix.