Add OSMesa headless mode, run WPT against Webrender. #13382

glennw · 2016-09-22T23:21:26Z

This change is

highfive · 2016-09-22T23:21:31Z

Heads up! This PR modifies the following files:

@asajeffrey: components/constellation/Cargo.toml
@wafflespeanut: python/servo/command_base.py, python/servo/testing_commands.py, python/servo/post_build_commands.py
@jgraham: tests/wpt/harness/wptrunner/browsers/servodriver.py, tests/wpt/harness/wptrunner/wptcommandline.py, tests/wpt/harness/wptrunner/browsers/servo.py, tests/wpt/harness/wptrunner/executors/executorservo.py, tests/wpt/harness/requirements_servo.txt
@KiChjang: components/script/Cargo.toml, components/script/dom/webidls/Window.webidl, components/script/lib.rs, components/net/Cargo.toml, components/script/dom/webidls/Element.webidl

highfive · 2016-09-22T23:21:32Z

Warning

These commits modify unsafe code. Please review it carefully!

glennw · 2016-09-22T23:21:56Z

@bors-servo try


        Auto merge of #13382 - glennw:headless, r=<try>

Add OSMesa headless mode, run WPT against Webrender.

bors-servo · 2016-09-22T23:21:59Z

⌛ Trying commit 5ad48af with merge 5abb39f...

glennw · 2016-09-22T23:25:53Z

This is ready for review now.

If anyone interested can take a look at the test expectation changes and let me know if there's anything in there that we don't want to land with updated expectations, I'll look further into the root cause of the differing results.

@emilio r? on the webgl paint thread changes.

@jdm r? on the script / webidl changes.

@larsbergstrom r? on the osmesa build changes.

@emilio / @larsbergstrom / @pcwalton r? on the glutin headless / osmesa changes.

@jgraham / @larsbergstrom r? on the python / wpt changes. Some parts (e.g. the WPT / python changes) might be in the wrong place - please let me know if the case.

bors-servo · 2016-09-22T23:29:24Z

💔 Test failed - linux-dev

glennw · 2016-09-23T01:48:30Z

@bors-servo try

bors-servo · 2016-09-23T01:48:32Z

⌛ Trying commit aa19938 with merge e31279a...


        Auto merge of #13382 - glennw:headless, r=<try>

Add OSMesa headless mode, run WPT against Webrender.  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13382)

bors-servo · 2016-09-23T01:52:03Z

💔 Test failed - linux-dev

jdm · 2016-09-23T04:14:10Z

@glennw Could you verify if all the other new crashes in the test expectations are the same matrix problem?

glennw · 2016-09-23T04:25:19Z

@jdm I've verified that the four panics in the transform tests are the same bug, and that the three panics in the filters tests are servo/webrender#419.

Both of them can be fixed before landing this if you'd prefer (the filters one is a bit more complicated to fix than the transform one though).

jdm · 2016-09-23T05:04:16Z

I'm fine with landing them as is. No need to hold them up as long as we understand what's going on.

jdm · 2016-09-23T05:05:17Z

r=me on the script/webidl changes.

emilio · 2016-09-23T06:42:52Z

components/canvas/webgl_paint_thread.rs

-                                    height as u32,
+                chan.send(CanvasData::Pixels(pixel_data)).unwrap();
+            }
+            WebGLPaintTaskData::WebRender(ref wr_api, _, Some(image_key)) => {


hmm... Do we have the context bound at this point in this thread? I think we don't.

Ah, yes. I guess we just need to add the WR(Some(image)) case to the init() method below, right? So that it binds the context in the same way as the non-WR readback case?

Hm... Yes, though you'd need to reach the actual context, plus apply commands locally in this thread instead of sending them to WebRender.

All in all, I think the best approach is to expose the RendererKind (and probably the wrapper types for the context too) and move the fallback logic here, so that the Readback data contains the correct kind of context.

emilio · 2016-09-23T06:53:06Z

ports/glutin/window.rs

@@ -215,7 +320,7 @@ impl Window {
    #[cfg(not(target_os = "android"))]
    fn gl_version() -> GlRequest {
        if opts::get().use_webrender {
-            return GlRequest::Specific(Api::OpenGl, (3, 2));
+            return GlRequest::Specific(Api::OpenGl, (3, 3));


Is this completely necessary? (I assume so, but it's kind of unfortunate)

emilio · 2016-09-23T06:53:06Z

ports/glutin/window.rs

+            WindowKind::Window(ref window) => {
+                window.set_inner_size(size.width as u32, size.height as u32)
+            }
+            WindowKind::Headless(..) => {}


I think we can simplify these cases returning early and adding a window() method, or something, but I guess this is fine. r=me on the glutin changes.

jgraham · 2016-09-23T10:04:54Z

wptrunner changes look mostly fine, but need to also land upstream.

Reviewed 4 of 4 files at r9, 1 of 1 files at r12.
Review status: 5 of 155 files reviewed at latest revision, 5 unresolved discussions, some commit checks failed.

python/servo/command_base.py, line 54 at r14 (raw file):

    deps_path = path.join(path.split(bin_path)[0], "build")
    with cd(deps_path):
        print(os.getcwd())

Intentional?

tests/wpt/harness/requirements_servo.txt, line 2 at r14 (raw file):

mozprocess >= 0.19
Mako >= 1.0.4

Hmm, why is this required to run the tests?

Comments from Reviewable

glennw · 2016-09-25T23:19:42Z

Review status: 5 of 155 files reviewed at latest revision, 5 unresolved discussions.

tests/wpt/harness/requirements_servo.txt, line 2 at r14 (raw file):

Previously, jgraham wrote…

Hmm, why is this required to run the tests?

The osmesa build process requires python + mako. I'm assuming this is the wrong place to put the requirement, although it does work :) Where should it be?

Comments from Reviewable

glennw · 2016-09-25T23:20:53Z

Review status: 5 of 155 files reviewed at latest revision, 5 unresolved discussions.

ports/glutin/window.rs, line 323 at r14 (raw file):

Previously, emilio (Emilio Cobos Álvarez) wrote…

Is this completely necessary? (I assume so, but it's kind of unfortunate)

Nope, fixed.

python/servo/command_base.py, line 54 at r14 (raw file):

Previously, jgraham wrote…

Intentional?

Fixed

Comments from Reviewable

glennw · 2016-09-25T23:22:18Z

@jgraham What is the upstreaming process - is it something we do after this all lands? Or does it need to be done beforehand?

glennw · 2016-09-26T02:21:46Z

@bors-servo try

bors-servo · 2016-09-28T01:57:59Z

📌 Commit cdb69d4 has been approved by larsbergstrom

bors-servo · 2016-09-28T02:46:14Z

⌛ Testing commit cdb69d4 with merge c7e1a57...


        Auto merge of #13382 - glennw:headless, r=larsbergstrom

Add OSMesa headless mode, run WPT against Webrender.  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13382)

bors-servo · 2016-09-28T03:38:45Z

💔 Test failed - linux-rel

notriddle · 2016-09-28T03:44:13Z

/css21_dev/html4/max-width-017.htm failed, and it's not a known intermittent.

glennw · 2016-09-28T03:58:26Z

@bors-servo retry

Testing if intermittent - have never seen that test fail before locally or during all these try runs.

bors-servo · 2016-09-28T03:59:36Z

⚡ Previous build results for arm32, arm64, linux-dev, mac-dev-unit, mac-rel-css, windows-dev are reusable. Rebuilding only linux-rel, mac-rel-wpt...

notriddle · 2016-09-28T04:20:49Z

CI caught fire.
🔥

glennw · 2016-09-28T05:31:53Z

@bors-servo retry

bors-servo · 2016-09-28T05:31:55Z

⚡ Previous build results for arm32, arm64, linux-dev, mac-dev-unit, mac-rel-css, windows-dev are reusable. Rebuilding only linux-rel, mac-rel-wpt...

bors-servo · 2016-09-28T06:35:13Z

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev


        Auto merge of #13562 - servo:jdm-patch-5, r=jgraham

Move mako out of wptrunner required packages There was a review comment about this in #13382 (comment) that was never addressed.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13562)


        servo: Merge #13562 - Move mako out of wptrunner required packages (f…

…rom servo:jdm-patch-5); r=jgraham There was a review comment about this in servo/servo#13382 (comment) that was never addressed. Source-Repo: https://github.com/servo/servo Source-Revision: c10de40e4ea4430037ac9156cc2b5d31f92a7cd4


        servo: Merge #13562 - Move mako out of wptrunner required packages (f…

…rom servo:jdm-patch-5); r=jgraham There was a review comment about this in servo/servo#13382 (comment) that was never addressed. Source-Repo: https://github.com/servo/servo Source-Revision: c10de40e4ea4430037ac9156cc2b5d31f92a7cd4 UltraBlame original commit: 3c1adde304c06e01eb22151a5cea65c35651021e


        servo: Merge #13562 - Move mako out of wptrunner required packages (f…

…rom servo:jdm-patch-5); r=jgraham There was a review comment about this in servo/servo#13382 (comment) that was never addressed. Source-Repo: https://github.com/servo/servo Source-Revision: c10de40e4ea4430037ac9156cc2b5d31f92a7cd4 UltraBlame original commit: 3c1adde304c06e01eb22151a5cea65c35651021e


        servo: Merge #13562 - Move mako out of wptrunner required packages (f…

…rom servo:jdm-patch-5); r=jgraham There was a review comment about this in servo/servo#13382 (comment) that was never addressed. Source-Repo: https://github.com/servo/servo Source-Revision: c10de40e4ea4430037ac9156cc2b5d31f92a7cd4 UltraBlame original commit: 3c1adde304c06e01eb22151a5cea65c35651021e

highfive assigned SimonSapin Sep 22, 2016

highfive added the S-awaiting-review label Sep 22, 2016

bors-servo added a commit that referenced this pull request Sep 22, 2016

Auto merge of #13382 - glennw:headless, r=<try>

Loading status checks…

5abb39f

Add OSMesa headless mode, run WPT against Webrender.

highfive added S-tests-failed and removed S-tests-failed labels Sep 22, 2016

highfive added the S-tests-failed label Sep 23, 2016

emilio reviewed Sep 23, 2016

View changes

glennw mentioned this pull request Sep 25, 2016

Switch the default renderer to WebRender #11923

Closed

glennw force-pushed the glennw:headless branch from aa19938 to 54c3b51 Sep 25, 2016

highfive removed the S-tests-failed label Sep 25, 2016

highfive added S-awaiting-merge and removed S-awaiting-review labels Sep 28, 2016

highfive added S-tests-failed and removed S-awaiting-merge labels Sep 28, 2016

bors-servo merged commit cdb69d4 into servo:master Sep 28, 2016
2 of 3 checks passed

2 of 3 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

homu Test successful
Details

jdm mentioned this pull request Oct 3, 2016

Move mako out of wptrunner required packages #13562

Merged

glennw deleted the glennw:headless branch Dec 12, 2016

servo / servo

Add OSMesa headless mode, run WPT against Webrender. #13382

Add OSMesa headless mode, run WPT against Webrender. #13382

glennw commented Sep 22, 2016 •

edited by larsbergstrom

highfive commented Sep 22, 2016

highfive commented Sep 22, 2016

glennw commented Sep 22, 2016

bors-servo commented Sep 22, 2016

glennw commented Sep 22, 2016

bors-servo commented Sep 22, 2016

glennw commented Sep 23, 2016

bors-servo commented Sep 23, 2016

bors-servo commented Sep 23, 2016

jdm commented Sep 23, 2016

glennw commented Sep 23, 2016

jdm commented Sep 23, 2016

jdm commented Sep 23, 2016

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

jgraham commented Sep 23, 2016

glennw commented Sep 25, 2016

glennw commented Sep 25, 2016

glennw commented Sep 25, 2016

glennw commented Sep 26, 2016

bors-servo commented Sep 28, 2016

bors-servo commented Sep 28, 2016

bors-servo commented Sep 28, 2016

notriddle commented Sep 28, 2016

glennw commented Sep 28, 2016

bors-servo commented Sep 28, 2016

notriddle commented Sep 28, 2016 •

edited

glennw commented Sep 28, 2016

bors-servo commented Sep 28, 2016

bors-servo commented Sep 28, 2016

servo / servo

Join GitHub today

Add OSMesa headless mode, run WPT against Webrender. #13382

Add OSMesa headless mode, run WPT against Webrender. #13382

Conversation

glennw commented Sep 22, 2016 • edited by larsbergstrom

highfive commented Sep 22, 2016

highfive commented Sep 22, 2016

glennw commented Sep 22, 2016

bors-servo commented Sep 22, 2016

glennw commented Sep 22, 2016

bors-servo commented Sep 22, 2016

glennw commented Sep 23, 2016

bors-servo commented Sep 23, 2016

bors-servo commented Sep 23, 2016

jdm commented Sep 23, 2016

glennw commented Sep 23, 2016

jdm commented Sep 23, 2016

jdm commented Sep 23, 2016

This comment has been minimized.

emilio Sep 23, 2016 • edited

This comment has been minimized.

glennw Sep 23, 2016

This comment has been minimized.

emilio Sep 23, 2016

This comment has been minimized.

emilio Sep 23, 2016

This comment has been minimized.

emilio Sep 23, 2016 • edited

jgraham commented Sep 23, 2016

glennw commented Sep 25, 2016

glennw commented Sep 25, 2016

glennw commented Sep 25, 2016

glennw commented Sep 26, 2016

bors-servo commented Sep 28, 2016

bors-servo commented Sep 28, 2016

bors-servo commented Sep 28, 2016

notriddle commented Sep 28, 2016

glennw commented Sep 28, 2016

bors-servo commented Sep 28, 2016

notriddle commented Sep 28, 2016 • edited

glennw commented Sep 28, 2016

bors-servo commented Sep 28, 2016

bors-servo commented Sep 28, 2016

glennw commented Sep 22, 2016 •

edited by larsbergstrom

emilio Sep 23, 2016 •

edited

emilio Sep 23, 2016 •

edited

notriddle commented Sep 28, 2016 •

edited