[compiletest-related cleanups 2/7] Feed stage number to compiletest directly#136472
Merged
bors merged 2 commits intorust-lang:masterfrom Feb 10, 2025
Merged
[compiletest-related cleanups 2/7] Feed stage number to compiletest directly#136472bors merged 2 commits intorust-lang:masterfrom
compiletest-related cleanups 2/7] Feed stage number to compiletest directly#136472bors merged 2 commits intorust-lang:masterfrom
Conversation
…--stage-id` Notably, this avoids having to do hacky string splitting based on `--stage-id`.
rustbot
added
A-compiletest
jieyouxu
commented
Feb 3, 2025
Comment on lines
-262
to
-264
| // FIXME(jieyouxu): improve the communication between bootstrap and compiletest here so | ||
| // we don't have to hack out a `stageN`. | ||
| let stage = self.config.stage_id.split('-').next().unwrap(); |
This was referenced Feb 3, 2025
Member
|
This doesn't seem obviously better (we're still hardcoding knowledge in compiletest about the bootstrap folder hierarchy, just adjusting how the base stageN gets threaded). But I'm fine with approving it; my own sense is that tight coupling here is unavoidable given the constraints so I don't care much either way. @bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
Member
Author
Yeah I really don't think we can avoid assuming knowledge about the folder hierarchy. In fact, tests rely on knowing about this structure for normalization purposes. This PR isn't to get rid of that, it's just make it slightly less hacky. |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 10, 2025
…kingjubilee Rollup of 12 pull requests Successful merges: - rust-lang#136053 (coverage: Defer part of counter-creation until codegen) - rust-lang#136201 (Removed dependency on the field-offset crate, alternate approach) - rust-lang#136228 (Simplify Rc::as_ptr docs + typo fix) - rust-lang#136353 (fix(libtest): Enable Instant on Emscripten targets) - rust-lang#136472 ([`compiletest`-related cleanups 2/7] Feed stage number to compiletest directly) - rust-lang#136487 (ci: stop mysql before removing it) - rust-lang#136552 (Use an `Option` for `FindNextFileHandle` in `ReadDir` instead of `INVALID_FILE_HANDLE` sentinel value) - rust-lang#136705 (Some miscellaneous edition-related library tweaks) - rust-lang#136707 (Bump `cc` to v1.2.13 for the compiler workspace) - rust-lang#136790 (Git blame ignore recent formatting commit) - rust-lang#136792 (Don't apply editorconfig to llvm) - rust-lang#136805 (ignore win_delete_self test in Miri) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 10, 2025
Rollup merge of rust-lang#136472 - jieyouxu:pass-stage, r=Mark-Simulacrum [`compiletest`-related cleanups 2/7] Feed stage number to compiletest directly Reference for overall changes: rust-lang#136437 Part **2** of **7** of the *`compiletest`-related cleanups* PR series. ### Summary - Pass stage number via new `--stage` compiletest flag directly from bootstrap, instead of deriving that info in compiletest by doing gymnastics on `--stage-id`. - Just a cleanup, should have no functional changes. r? bootstrap
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Reference for overall changes: #136437
Part 2 of 7 of the
compiletest-related cleanups PR series.Summary
--stagecompiletest flag directly from bootstrap, instead of deriving that info in compiletest by doing gymnastics on--stage-id.r? bootstrap