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 test-wpt and test-css for Windows. #14039

Merged
merged 1 commit into from Nov 16, 2016
Merged

Conversation

metajack
Copy link
Contributor

@metajack metajack commented Nov 3, 2016

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).


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because testing the tests is too meta for me

This change is Reviewable

@highfive
Copy link

highfive commented Nov 3, 2016

Heads up! This PR modifies the following files:

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Nov 3, 2016
@metajack
Copy link
Contributor Author

metajack commented Nov 3, 2016

r? @larsbergstrom

Also, perhaps @jgraham should look at the openssl change.

@highfive highfive assigned larsbergstrom and unassigned pcwalton Nov 3, 2016
@jgraham
Copy link
Contributor

jgraham commented Nov 3, 2016

Remeber the wptrunner changes need to be upstreamed.


Reviewed 6 of 6 files at r1.
Review status: all files reviewed at latest revision, 2 unresolved discussions, some commit checks failed.


python/mach_bootstrap.py, line 79 at r1 (raw file):

# Possible names of executables
if sys.platform in ['msys', 'win32']:

This could use a comment about why.


tests/wpt/web-platform-tests/tools/sslutils/openssl.py, line 60 at r1 (raw file):

        self.cmd += list(args)

        env = {}

Why?


Comments from Reviewable

@metajack
Copy link
Contributor Author

metajack commented Nov 3, 2016

@jgraham Added comments as requested. I'll prepare an upstream PR with the same diff in a bit.

@metajack
Copy link
Contributor Author

metajack commented Nov 3, 2016

Upstream PR is w3c/wpt-tools#139

@metajack
Copy link
Contributor Author

metajack commented Nov 3, 2016

Upstream PR has landed.

@jgraham
Copy link
Contributor

jgraham commented Nov 3, 2016

Reviewed 2 of 2 files at r2.
Review status: all files reviewed at latest revision, all discussions resolved, some commit checks failed.


Comments from Reviewable

@metajack
Copy link
Contributor Author

metajack commented Nov 3, 2016

Updated to add correct PATH for AppVeyor gnu builds.

@jdm
Copy link
Member

jdm commented Nov 3, 2016

That has successfully returned us to the status quo of #13939.

@jgraham
Copy link
Contributor

jgraham commented Nov 3, 2016

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 77ccb15 has been approved by jgraham

@highfive highfive assigned jgraham and unassigned larsbergstrom Nov 3, 2016
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Nov 3, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit 77ccb15 with merge 92115c7...

bors-servo pushed a commit that referenced this pull request Nov 4, 2016
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 -->
@bors-servo
Copy link
Contributor

💔 Test failed - windows-dev

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Nov 4, 2016
@metajack
Copy link
Contributor Author

metajack commented Nov 4, 2016

@bors-servo retry

  • had to update windows builder for the correct PATH

@bors-servo
Copy link
Contributor

⌛ Testing commit 77ccb15 with merge 9c2bb06...

bors-servo pushed a commit that referenced this pull request Nov 4, 2016
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 -->
@highfive highfive removed the S-tests-failed The changes caused existing tests to fail. label Nov 4, 2016
@highfive highfive removed the S-tests-failed The changes caused existing tests to fail. label Nov 16, 2016
@metajack
Copy link
Contributor Author

@bors-servo try

@bors-servo
Copy link
Contributor

⌛ Trying commit 7f8412c with merge 87f0d2c...

bors-servo pushed a commit that referenced this pull request Nov 16, 2016
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 -->
@bors-servo
Copy link
Contributor

💔 Test failed - windows-dev

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Nov 16, 2016
@highfive highfive removed the S-tests-failed The changes caused existing tests to fail. label Nov 16, 2016
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).
@metajack
Copy link
Contributor Author

@bors-servo retry

  • another time into the breach

@metajack
Copy link
Contributor Author

@bors-servo r=jgraham

@bors-servo
Copy link
Contributor

📌 Commit 8e8519d has been approved by jgraham

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Nov 16, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit 8e8519d with merge 17bf6ae...

bors-servo pushed a commit that referenced this pull request Nov 16, 2016
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 -->
@bors-servo bors-servo mentioned this pull request Nov 16, 2016
3 tasks
@bors-servo
Copy link
Contributor

@bors-servo bors-servo merged commit 8e8519d into servo:master Nov 16, 2016
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Nov 16, 2016
@metajack metajack deleted the windows-wpt branch November 16, 2016 22:05
@nox
Copy link
Contributor

nox commented Feb 8, 2017

This patch makes people with non-UTF-8 environment variables unable to run tests. Was that intended? Can that be reverted?

@Manishearth
Copy link
Member

Can someone address @nox's question? This is affecting me too.

@larsbergstrom
Copy link
Contributor

The problem according to the comment is that non-UTF-8 environment variables cannot be passed to create process. What should we be doing here - it sounds like a fail either way?

I assume the options are:

  1. Only do the UTF-8 filtering on windows
  2. Just drop non-UTF-8 environment variables
  3. Revert the patch, rebreak windows
    ?

@Manishearth
Copy link
Member

I looked into this more, test-wpt now actually handles the error. test-css however has an older copy of sslutils.py which doesn't deal with this.

#15452 (comment)

I'm not sure which of these files we can edit and what the canonical source is.

@jdm
Copy link
Member

jdm commented Nov 2, 2017

You can do anything you want to test-css, because it's going away in #19070. The canonical source for those files is upstream web-platform-tests.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet