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

Remove -w flag now that WebRender is always used #15064

Merged
merged 1 commit into from Jan 23, 2017

Conversation

@aneeshusa
Copy link
Member

aneeshusa commented Jan 17, 2017

Also remove the obsolete --cpu and --gpu renderer flags,
which also are no longer used.

Update tests and wptrunner to not pass these flags.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #13761 (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because the tests are updated to no longer pass these flags

This change is Reviewable

@highfive
Copy link

highfive commented Jan 17, 2017

Heads up! This PR modifies the following files:

  • @jgraham: tests/wpt/harness/wptrunner/browsers/servo.py, tests/wpt/harness/wptrunner/webdriver_server.py, tests/wpt/harness/wptrunner/browsers/servodriver.py, tests/wpt/harness/wptrunner/wptcommandline.py
@@ -80,7 +80,7 @@ class ServoWebDriverBrowser(Browser):
used_ports = set()

def __init__(self, logger, binary, debug_info=None, webdriver_host="127.0.0.1",
user_stylesheets=None, render_backend="webrender"):

This comment has been minimized.

@shinglyu

shinglyu Jan 17, 2017

Member

Maybe you want to remove line 93 as well?

@jgraham
Copy link
Contributor

jgraham commented Jan 17, 2017

Changes to wptrunner need to be upstreamed to https://github.com/w3c/wptrunner

@Ms2ger
Copy link
Contributor

Ms2ger commented Jan 18, 2017

Make sure the changes here match w3c/wptrunner#224 and point to that PR in the commit message, and r=me.

@aneeshusa aneeshusa force-pushed the aneeshusa:remove-webrender-opt branch from 058c3f1 to 2c4194a Jan 18, 2017
@aneeshusa
Copy link
Member Author

aneeshusa commented Jan 18, 2017

This also needs w3c/wptrunner#226 now.

@aneeshusa
Copy link
Member Author

aneeshusa commented Jan 20, 2017

@bors-servo r=Ms2ger

@bors-servo
Copy link
Contributor

bors-servo commented Jan 20, 2017

📌 Commit 2c4194a has been approved by Ms2ger

@bors-servo
Copy link
Contributor

bors-servo commented Jan 20, 2017

Testing commit 2c4194a with merge 97714fb...

bors-servo added a commit that referenced this pull request Jan 20, 2017
Remove -w flag now that WebRender is always used

Also remove the obsolete `--cpu` and `--gpu` renderer flags,
which also are no longer used.

Update tests and wptrunner to not pass these flags.

<!-- Please describe your changes on the following line: -->

---
<!-- 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
- [x] These changes fix #13761 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because the tests are updated to no longer pass these flags

<!-- 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/15064)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jan 20, 2017

💔 Test failed - linux-rel-wpt

Also remove the obsolete `--cpu` and `--gpu` renderer flags,
which also are no longer used.

Update tests and wptrunner to not pass these flags.
wptrunner changes have been upstreamed in:
  - w3c/wptrunner#224
  - w3c/wptrunner#226
@aneeshusa aneeshusa force-pushed the aneeshusa:remove-webrender-opt branch from 2c4194a to b94b58f Jan 20, 2017
@aneeshusa
Copy link
Member Author

aneeshusa commented Jan 20, 2017

Updated test expectations to not branch onbackend. @bors-servo try

@bors-servo
Copy link
Contributor

bors-servo commented Jan 20, 2017

Trying commit b94b58f with merge 9ebf92a...

bors-servo added a commit that referenced this pull request Jan 20, 2017
Remove -w flag now that WebRender is always used

Also remove the obsolete `--cpu` and `--gpu` renderer flags,
which also are no longer used.

Update tests and wptrunner to not pass these flags.

<!-- Please describe your changes on the following line: -->

---
<!-- 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
- [x] These changes fix #13761 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because the tests are updated to no longer pass these flags

<!-- 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/15064)
<!-- Reviewable:end -->
@Ms2ger
Copy link
Contributor

Ms2ger commented Jan 23, 2017

@bors-servo try- r+ retry

@bors-servo
Copy link
Contributor

bors-servo commented Jan 23, 2017

📌 Commit b94b58f has been approved by Ms2ger

@bors-servo
Copy link
Contributor

bors-servo commented Jan 23, 2017

Testing commit b94b58f with merge bb24fd3...

bors-servo added a commit that referenced this pull request Jan 23, 2017
Remove -w flag now that WebRender is always used

Also remove the obsolete `--cpu` and `--gpu` renderer flags,
which also are no longer used.

Update tests and wptrunner to not pass these flags.

<!-- Please describe your changes on the following line: -->

---
<!-- 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
- [x] These changes fix #13761 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because the tests are updated to no longer pass these flags

<!-- 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/15064)
<!-- Reviewable:end -->
@bors-servo bors-servo merged commit b94b58f into servo:master Jan 23, 2017
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
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 23, 2017
Revert "Remove -w flag now that WebRender is always used"

This reverts commit b94b58f.
The wptrunner changes are not quite right and cause Python exceptions
inside the test haness.

This reverts #15064. See build.servo.org/builders/linux-rel-css/builds/2005/steps/test/logs/stdio for an example log with the error; not sure why Homu didn't catch this in the actual PR.

cc @Ms2ger If possible I'd like help on a fixed version of the patch; otherwise I'll send in a revert to the wptrunner repo as well.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- 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/15158)
<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Jan 24, 2017
Revert several changes that broke tests

This is based on #15158 by @aneeshusa, with additional reverts.

This reverts #15064, which is causing many tests not to run, and #15129 and #15155 which landed while tests were not running and may have caused some new failures in iframe tests.

<!-- 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/15164)
<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Jan 24, 2017
Revert several changes that broke tests

This is based on #15158 by @aneeshusa, with additional reverts.

This reverts #15064, which is causing many tests not to run, and #15129 and #15155 which landed while tests were not running and may have caused some new failures in iframe tests.

<!-- 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/15164)
<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Jan 24, 2017
Revert several changes that broke tests

This is based on #15158 by @aneeshusa, with additional reverts.

This reverts #15064, which is causing many tests not to run, and #15129 and #15155 which landed while tests were not running and may have caused some new failures in iframe tests.

<!-- 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/15164)
<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Jan 24, 2017
Make test-wpt-failure smoketest work again.

Having this testsuite working would have avoided the issue caused by #15064. This will need to wait until after #15164 is merged, because it picks up the failure that currently exists on master.

<!-- 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/15181)
<!-- Reviewable:end -->
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.

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