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

Fix ./mach run on Windows #9415

Merged
merged 2 commits into from Jan 26, 2016
Merged

Fix ./mach run on Windows #9415

merged 2 commits into from Jan 26, 2016

Conversation

@adamncasey
Copy link
Contributor

adamncasey commented Jan 25, 2016

This branch also includes the commit being reviewed in #9408 . Is it OK to just wait for that one to merge, or should I separate them?

This patch adds the BIN_SUFFIX to the servo executable name when doing ./mach run.

However just doing this caused subprocess to error due to some unicode symbols in PATH.

To fix this, I pulled a peice of code from mozilla-central which fixes this problem there. Source: https://dxr.mozilla.org/mozilla-central/source/python/mach/mach/mixin/process.py#108

Revisiting this now (originally developed this a few weeks ago), perhaps we should be using https://github.com/servo/servo/blob/master/python/mach/mach/mixin/process.py instead of subprocess to give us all of this crossplatform process execution support. I think that should be a nice to have though - this patch at least gets a necessary development command working on windows.

Tested on Windows and Ubuntu.

Review on Reviewable

adamncasey added 2 commits Jan 23, 2016
Fix unicode PATH the same way as mozilla-central does it for windows.
Also append extra PATHs instead of prepending, for some reason that broke ./mach run
@highfive
Copy link

highfive commented Jan 25, 2016

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @larsbergstrom (or someone else) soon.

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Jan 25, 2016

@adamncasey We can close #9408 and I'll just review and test this one as a whole, if that works for you.

Thanks for all your work on Windows - I really appreciate it!

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Jan 25, 2016

Hrm, when I run with ./mach run http://www.lars.com, I get "Servo exited with return value 127". target/debug/servo http://www.lars.com works, though.

Also, on the first commit, I think we would need to install virtualenv for the mingw64 python in order for this to work.

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Jan 26, 2016

Aha, I've managed to get this working locally - user error on my part. I'll also land the other python-related fix because it works with the current instructions.

I suspect what's needed to make the "mingw64 python" work is installing virtualenv/easy_install for mingw64.

@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Jan 26, 2016

📌 Commit bd0f7d1 has been approved by larsbergstrom

@bors-servo
Copy link
Contributor

bors-servo commented Jan 26, 2016

Testing commit bd0f7d1 with merge 80c2911...

bors-servo added a commit that referenced this pull request Jan 26, 2016
Fix ./mach run on Windows

This branch also includes the commit being reviewed in #9408 . Is it OK to just wait for that one to merge, or should I separate them?

This patch adds the BIN_SUFFIX to the servo executable name when doing ./mach run.

However just doing this caused subprocess to error due to some unicode symbols in PATH.

To fix this, I pulled a peice of code from mozilla-central which fixes this problem there. Source: https://dxr.mozilla.org/mozilla-central/source/python/mach/mach/mixin/process.py#108

Revisiting this now (originally developed this a few weeks ago), perhaps we should be using https://github.com/servo/servo/blob/master/python/mach/mach/mixin/process.py instead of subprocess to give us all of this crossplatform process execution support. I think that should be a nice to have though - this patch at least gets a necessary development command working on windows.

Tested on Windows and Ubuntu.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9415)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jan 26, 2016

💔 Test failed - linux-rel

@adamncasey
Copy link
Contributor Author

adamncasey commented Jan 26, 2016

Looks like a reftest failed. Is this a known intermittent failure?

Tests with unexpected results:
FAIL [expected PASS] /_mozilla/css/abs-overflow-stackingcontext.html
└ → /_mozilla/css/abs-overflow-stackingcontext.html d9d9e489bc5b4508c01b06c7ff92f19dcc2ece3c
/_mozilla/css/abs-overflow-stackingcontext_ref.html 38ce16767330b708ec4459a742a7122c37307f64
Testing d9d9e489bc5b4508c01b06c7ff92f19dcc2ece3c == 38ce16767330b708ec4459a742a7122c37307f64

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Jan 26, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Jan 26, 2016

Previous build results for android, gonk, linux-dev, mac-dev-unit, mac-rel-css, mac-rel-wpt are reusable. Rebuilding only linux-rel...

@bors-servo
Copy link
Contributor

bors-servo commented Jan 26, 2016

@bors-servo bors-servo merged commit bd0f7d1 into servo:master Jan 26, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
bors-servo added a commit that referenced this pull request Jan 27, 2016
Prepend PATH extras instead of append (Fix Issue #9437)

Should fix multirust issue #9437 which appeared after #9415 landed.

@jdm to confirm

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9440)
<!-- Reviewable:end -->
gecko-dev-updater pushed a commit to marco-c/gecko-dev-comments-removed that referenced this pull request Oct 1, 2019
… #9437) (from adamncasey:fix-multirust); r=jdm

Should fix multirust issue servo/servo#9437 which appeared after servo/servo#9415 landed.

jdm to confirm

Source-Repo: https://github.com/servo/servo
Source-Revision: 03b763c2c5b873ccc454278a55737bc37e940e97

UltraBlame original commit: a734c8ee197848ee30c80d7dd9dbf51e84e2eb4a
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified-and-comments-removed that referenced this pull request Oct 1, 2019
… #9437) (from adamncasey:fix-multirust); r=jdm

Should fix multirust issue servo/servo#9437 which appeared after servo/servo#9415 landed.

jdm to confirm

Source-Repo: https://github.com/servo/servo
Source-Revision: 03b763c2c5b873ccc454278a55737bc37e940e97

UltraBlame original commit: a734c8ee197848ee30c80d7dd9dbf51e84e2eb4a
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified that referenced this pull request Oct 1, 2019
… #9437) (from adamncasey:fix-multirust); r=jdm

Should fix multirust issue servo/servo#9437 which appeared after servo/servo#9415 landed.

jdm to confirm

Source-Repo: https://github.com/servo/servo
Source-Revision: 03b763c2c5b873ccc454278a55737bc37e940e97

UltraBlame original commit: a734c8ee197848ee30c80d7dd9dbf51e84e2eb4a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.