Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make a test compatible across python versions. #66396

Merged
merged 2 commits into from
Nov 18, 2019
Merged

Make a test compatible across python versions. #66396

merged 2 commits into from
Nov 18, 2019

Conversation

smmalis37
Copy link
Contributor

@smmalis37 smmalis37 commented Nov 14, 2019

Progress on #65063

This PR allows this test to work on both python2 and python3, and it also allows ./x.py test to fully complete on my system without python2 installed at all.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 14, 2019
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Nov 14, 2019

📌 Commit f37f423 has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 14, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Nov 14, 2019
Make a test compatible across python versions.

Progress on rust-lang#65063

This PR allows this test to work on both python2 and python3, and it also allows `./x.py test` to fully complete on my system without python2 installed at all.
tmandry added a commit to tmandry/rust that referenced this pull request Nov 14, 2019
Make a test compatible across python versions.

Progress on rust-lang#65063

This PR allows this test to work on both python2 and python3, and it also allows `./x.py test` to fully complete on my system without python2 installed at all.
@JohnTitor
Copy link
Member

Seems failed in #66421 (comment)
@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 15, 2019
@smmalis37
Copy link
Contributor Author

If I'm reading that right there's no python command on i686-gnu, but there is on other architectures? Does someone who's more familiar with the CI environments know what happened here?

@mati865
Copy link
Contributor

mati865 commented Nov 15, 2019

It's because installing python2.7 with apt installs only the suffixed binaries. python without suffix is provided by python package which points to python2.7 in currently used distributions but that might change in Ubuntu 20.04 as there are plans to remove Python 2 altogether.
This affects other builders as well, scrips are located in https://github.com/rust-lang/rust/tree/master/src/ci/docker

The decision what to do here is up to reviewer.

@alexcrichton
Copy link
Member

I don't know how best to fix this, but it looks like the CI environment doesn't have a python executable.

@smmalis37
Copy link
Contributor Author

The test failed on Linux i686-gnu but succeeded on Linux x86_64-gnu-llvm-6.0. Comparing the packages installed at src/ci/docker/i686-gnu/Dockerfile vs src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile shows these packages installed on x86_64 but not i686:

g++ vs g++-multilib
llvm-6.0-tools
libedit-dev
libssl-dev
pkg-config
zlib1g-dev

It looks like llvm-6.0-tools depends on python, which means we get lucky on that platform. I'm assuming something similar is true for the other successful platforms. I'll change the makefile back to calling python2.7, and that can switch when all the infrastructure updates to python3. The change to the actual python file will still help, since it won't need to be changed at that point.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Nov 16, 2019

📌 Commit 56f9212 has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 16, 2019
bors added a commit that referenced this pull request Nov 18, 2019
Make a test compatible across python versions.

Progress on #65063

This PR allows this test to work on both python2 and python3, ~~and it also allows `./x.py test` to fully complete on my system without python2 installed at all.~~
@bors
Copy link
Contributor

bors commented Nov 18, 2019

⌛ Testing commit 56f9212 with merge 9966af3...

@bors
Copy link
Contributor

bors commented Nov 18, 2019

☀️ Test successful - checks-azure
Approved by: alexcrichton
Pushing 9966af3 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 18, 2019
@bors bors merged commit 56f9212 into rust-lang:master Nov 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants