Fix tests/run-make-translation when download-rustc is enabled#110525
Merged
bors merged 1 commit intorust-lang:masterfrom Apr 19, 2023
Merged
Fix tests/run-make-translation when download-rustc is enabled#110525bors merged 1 commit intorust-lang:masterfrom
tests/run-make-translation when download-rustc is enabled#110525bors merged 1 commit intorust-lang:masterfrom
Conversation
When building locally, we never generate a `share` directory in the local sysroot. However, when we download the `rustc` component from ci, it includes a `share/man` directory in the sysroot. The `run-make/translation` test assumed that it didn't exist, and would create a link from `fakeroot` to the real share directory, and write symbolic links into it. Change it not to create the link, so that rustc doesn't try to load multiple copies of the same `.ftl` file.
Collaborator
|
(rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
the
S-waiting-on-review
jyn514
added
A-testsuite
Member
|
Thanks for the PR! |
Member
|
@bors r+ |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 19, 2023
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#110123 ('./configure' now checks if 'config.toml' exists before writing to that destination) - rust-lang#110429 (Spelling src bootstrap) - rust-lang#110430 (Spelling src ci) - rust-lang#110515 (Don't special-case download-rustc in `maybe_install_llvm`) - rust-lang#110521 (Fix `x test lint-docs linkchecker` when download-rustc is enabled) - rust-lang#110525 (Fix `tests/run-make-translation` when download-rustc is enabled) - rust-lang#110531 (small type system cleanup) - rust-lang#110533 (Missing blanket impl trait not public) - rust-lang#110540 (Fix wrong comment in rustc_hir/src/hir.rs) - rust-lang#110541 (Fix various configure bugs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
5 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.
When building locally, we never generate a
sharedirectory in the local sysroot. However, when we download therustccomponent from ci, it includes ashare/mandirectory in the sysroot. Therun-make/translationtest assumed that it didn't exist, and would create a link fromfakerootto the real share directory, and write symbolic links into it. Change it not to create the link, so that rustc doesn't try to load multiple copies of the same.ftlfile.Fixes #110357.