mirror of
https://github.com/servo/servo.git
synced 2025-07-30 18:50:36 +01:00
Auto merge of #14039 - metajack:windows-wpt, r=jgraham
Fix test-wpt and test-css for Windows. <!-- Please describe your changes on the following line: --> In addition to minor changes for Windows, this forces Windows Python to be used for all Windows builds (instead of using Windows Python only for pc-windows-msvc builds). --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require tests because testing the tests is too meta for me <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14039) <!-- Reviewable:end -->
This commit is contained in:
commit
17bf6aed21
7 changed files with 104 additions and 19 deletions
|
@ -107,7 +107,10 @@ def host_triple():
|
|||
elif os_type == "android":
|
||||
os_type = "linux-androideabi"
|
||||
elif os_type == "windows":
|
||||
os_type = "pc-windows-msvc"
|
||||
if os.getenv("MSYSTEM") is None:
|
||||
os_type = "pc-windows-msvc"
|
||||
else:
|
||||
os_type = "pc-windows-gnu"
|
||||
elif os_type.startswith("mingw64_nt-") or os_type.startswith("cygwin_nt-"):
|
||||
os_type = "pc-windows-gnu"
|
||||
elif os_type == "freebsd":
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue