bootstrap: tests should use rustc from config.toml#51977
Merged
bors merged 1 commit intorust-lang:masterfrom Jul 3, 2018
Merged
bootstrap: tests should use rustc from config.toml#51977bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Member
|
@bors r+ |
Collaborator
|
📌 Commit 8176fa120390d78ff05b1bbf670e313fda175fb9 has been approved by |
bors
added
S-waiting-on-bors
Collaborator
|
☔ The latest upstream changes (presumably #51122) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
Tests should always use "rustc" and "cargo" from config.toml instead of assuming that stage0 binaries was downloaded to build directory.
mnd
force-pushed
the
fix-bootstrap-test-with-local-stage0
branch
from
8176fa1 to
ddc1d29
Compare
Contributor
Author
|
@bors updated |
Contributor
|
@bors r=simulacrum |
Collaborator
|
📌 Commit ddc1d29 has been approved by |
bors
added
S-waiting-on-bors
Member
|
@bors rollup |
Mark-Simulacrum
added a commit
to Mark-Simulacrum/rust
that referenced
this pull request
Jul 2, 2018
…tage0, r=simulacrum bootstrap: tests should use rustc from config.toml Tests should always use "rustc" and "cargo" from config.toml instead of assuming that stage0 binaries was downloaded to build directory. Without this change `./x.py test src/bootstrap` will always try to use `build/ARCH/stage0/bin/rustc` file as compiler, but when we use local compiler to bootstrap this file does not exist.
emilyalbini
added a commit
to emilyalbini/rust
that referenced
this pull request
Jul 3, 2018
…tage0, r=simulacrum bootstrap: tests should use rustc from config.toml Tests should always use "rustc" and "cargo" from config.toml instead of assuming that stage0 binaries was downloaded to build directory. Without this change `./x.py test src/bootstrap` will always try to use `build/ARCH/stage0/bin/rustc` file as compiler, but when we use local compiler to bootstrap this file does not exist.
emilyalbini
added a commit
to emilyalbini/rust
that referenced
this pull request
Jul 3, 2018
…tage0, r=simulacrum bootstrap: tests should use rustc from config.toml Tests should always use "rustc" and "cargo" from config.toml instead of assuming that stage0 binaries was downloaded to build directory. Without this change `./x.py test src/bootstrap` will always try to use `build/ARCH/stage0/bin/rustc` file as compiler, but when we use local compiler to bootstrap this file does not exist.
bors
added a commit
that referenced
this pull request
Jul 3, 2018
Rollup of 13 pull requests Successful merges: - #51548 (Initialize LLVM's AMDGPU target machine, if available.) - #51809 (Add read_exact_at and write_all_at methods to FileExt on unix) - #51914 (add outlives annotations to `BTreeMap`) - #51958 (Show known meta items in unknown meta items error) - #51973 (Make Stdio handle UnwindSafe) - #51977 (bootstrap: tests should use rustc from config.toml) - #51978 (Do not suggest changes to str literal if it isn't one) - #51979 (Get rid of `TyImplTraitExistential`) - #51980 (Emit column info in debuginfo for non msvc like targets) - #51982 (incr.comp.: Take names of children into account when computing the ICH of a module's HIR.) - #51997 (add entry for cargo-metadata feature to RELEASES) - #52004 (toolstate: Fixed detection of changed submodule, and other fixes.) - #52006 ( Change --keep-stage to apply more often) Failed merges: r? @ghost
Collaborator
|
☔ The latest upstream changes (presumably #52014) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
Contributor
Author
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.
Tests should always use "rustc" and "cargo" from config.toml instead of assuming that stage0 binaries was downloaded to build directory.
Without this change
./x.py test src/bootstrapwill always try to usebuild/ARCH/stage0/bin/rustcfile as compiler, but when we use local compiler to bootstrap this file does not exist.