look for python2 symlinks before bootstrap python#58676
Merged
bors merged 2 commits intorust-lang:masterfrom Mar 9, 2019
Merged
look for python2 symlinks before bootstrap python#58676bors merged 2 commits intorust-lang:masterfrom
bors merged 2 commits 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
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
Member
|
@bors: r+ |
Collaborator
|
📌 Commit 1e43666 has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Feb 25, 2019
…hton look for python2 symlinks before bootstrap python Before this commit, if you're running x.py directly on a system where `python` is symlinked to Python 3, then the `python` config option will default to a Python 3 interpreter. This causes debuginfo tests to fail with an opaque error message, since they have a hard requirement on Python 2. This commit modifies the Python probe behavior to look for python2.7 and python2 *before* using the interpreter used to execute `x.py`.
Collaborator
|
⌛ Testing commit 1e43666 with merge 349eb440ce6130e6e2a4343ef8e187e4f42948d5... |
Collaborator
|
💔 Test failed - status-appveyor |
bors
added
S-waiting-on-review
kennytm
added
S-waiting-on-author
Contributor
Author
|
Spurious network failure. |
Member
|
Unfortunately I don't think that's spurious, I think that may be LLVM selecting a different (and incompatible) python for its build. |
Contributor
Author
|
I see. I wonder if it's sufficient to blacklist the msys pythons, or to prefer |
Member
|
Yeah I think the issue is that something like the msys python is being used (which is first in PATH) instead of the system python which we prefer (or something like that). I don't personally have a preference for how it's best solved. |
Member
|
What about changing shebang to |
Contributor
Author
|
@mati865 I think that would break |
Contributor
Author
|
Added some debug code to appveyor. Is it possible to run appveyor via try run or do I need an r+? |
Member
|
@euclio Appveyor doesn't check |
The old logic would incorrectly look for "python2.exe" when searching for "python2.7.exe".
Before this commit, if you're running x.py directly on a system where `python` is symlinked to Python 3, then the `python` config option will default to a Python 3 interpreter. This causes debuginfo tests to fail with an opaque error message, since they have a hard requirement on Python 2. This commit modifies the Python probe behavior to look for python2.7 and python2 *before* using the interpreter used to execute `x.py`.
Contributor
Author
|
@alexcrichton Found and fixed a bug in the PATH probing on Windows. Should be ready for another go. @mati865 Thanks for the help! |
Member
|
@bors: r+ |
Collaborator
|
📌 Commit 12d8a7d has been approved by |
bors
added
S-waiting-on-bors
Collaborator
|
⌛ Testing commit 12d8a7d with merge cc8183b769529e2702c2b352a9285fc0a7e1206d... |
Collaborator
|
💔 Test failed - status-appveyor |
bors
added
S-waiting-on-review
Contributor
Author
|
Spurious, #58160. |
Member
|
@bors: retry |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 9, 2019
…hton look for python2 symlinks before bootstrap python Before this commit, if you're running x.py directly on a system where `python` is symlinked to Python 3, then the `python` config option will default to a Python 3 interpreter. This causes debuginfo tests to fail with an opaque error message, since they have a hard requirement on Python 2. This commit modifies the Python probe behavior to look for python2.7 and python2 *before* using the interpreter used to execute `x.py`.
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 9, 2019
…hton look for python2 symlinks before bootstrap python Before this commit, if you're running x.py directly on a system where `python` is symlinked to Python 3, then the `python` config option will default to a Python 3 interpreter. This causes debuginfo tests to fail with an opaque error message, since they have a hard requirement on Python 2. This commit modifies the Python probe behavior to look for python2.7 and python2 *before* using the interpreter used to execute `x.py`.
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 9, 2019
…hton look for python2 symlinks before bootstrap python Before this commit, if you're running x.py directly on a system where `python` is symlinked to Python 3, then the `python` config option will default to a Python 3 interpreter. This causes debuginfo tests to fail with an opaque error message, since they have a hard requirement on Python 2. This commit modifies the Python probe behavior to look for python2.7 and python2 *before* using the interpreter used to execute `x.py`.
bors
added a commit
that referenced
this pull request
Mar 9, 2019
Rollup of 13 pull requests Successful merges: - #58518 (Use early unwraps instead of bubbling up errors just to unwrap in the end) - #58626 (rustdoc: add option to calculate "documentation coverage") - #58629 (rust-lldb: fix crash when printing empty string) - #58660 (MaybeUninit: add read_initialized, add examples) - #58670 (fixes #52482) - #58676 (look for python2 symlinks before bootstrap python) - #58679 (Refactor passes and pass execution to be more parallel) - #58750 (Make `Unique::as_ptr`, `NonNull::dangling` and `NonNull::cast` const) - #58762 (Mention `unwind(aborts)` in diagnostics for `#[unwind]`) - #58924 (Add as_slice() to slice::IterMut and vec::Drain) - #58990 (Actually publish miri in the manifest) - #59018 (std: Delete a by-definition spuriously failing test) - #59045 (Expose new_sub_parser_from_file) Failed merges: r? @ghost
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
7 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.
Before this commit, if you're running x.py directly on a system where
pythonis symlinked to Python 3, then thepythonconfig option willdefault to a Python 3 interpreter. This causes debuginfo tests to fail
with an opaque error message, since they have a hard requirement on
Python 2.
This commit modifies the Python probe behavior to look for python2.7 and
python2 before using the interpreter used to execute
x.py.