Skip to content

/ servo

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

Use sdk/tests when syncing from upstream Khronos WebGL tests #21519

Merged
merged 2 commits into from Aug 25, 2018
Merged

Use sdk/tests when syncing from upstream Khronos WebGL tests #21519

merged 2 commits into from Aug 25, 2018

Conversation

@nox
Copy link
Member

nox commented Aug 25, 2018 •
edited by SimonSapin

This change is Reviewable
@nox
Move Khronos WebGL tests to /_webgl/
4852f7d
@highfive
Copy link

highfive commented Aug 25, 2018

Heads up! This PR modifies the following files:

  • @wafflespeanut: python/tidy/servo_tidy/tidy.py
  • @jgraham: tests/wpt/webgl/tests/conformance2/uniforms/incompatible-texture-type-for-sampler.html, tests/wpt/webgl/tests/deqp/framework/opengl/simplereference/sglrShaderProgram.js, tests/wpt/webgl/tests/conformance/ogles/GL2Tests/get_attribute_location/brick.frag, tests/wpt/webgl/tests/deqp/functional/gles3/texturefiltering/cube_combinations_02.html, tests/wpt/webgl/tests/deqp/functional/gles3/textureshadow/cube_linear_mipmap_nearest_not_equal.html and 5192 more
  • @edunham: servo-tidy.toml, python/tidy/servo_tidy/tidy.py
@nox
Copy link
Member Author

nox commented Aug 25, 2018

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Aug 25, 2018

⌛ Trying commit 2a13f23 with merge 0ba17cc...
bors-servo added a commit that referenced this pull request Aug 25, 2018
@bors-servo
Auto merge of #21519 - servo:webgl, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
0ba17cc 
Use sdk/tests when syncing from upstream Khronos WebGL 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/21519)
<!-- Reviewable:end -->
@jdm
jdm reviewed Aug 25, 2018
View changes
tests/wpt/webgl/meta/conformance/canvas/buffer-offscreen-test.html.ini Outdated
@@ -1,6 +1,4 @@
[buffer-offscreen-test.html]
bug: https://github.com/servo/servo/issues/21132

This comment has been minimized.

Sign in to view
Copy link
@jdm

jdm Aug 25, 2018

Member

We're losing a number of annotations in this commit :/

This comment has been minimized.

Sign in to view
Copy link
@nox

nox Aug 25, 2018

Author Member

I added them back.
@jdm
Copy link
Member

jdm commented Aug 25, 2018

What was the motivation for moving the tests from tests/mozilla/tests/webgl to tests/webgl?
@nox
Copy link
Member Author

nox commented Aug 25, 2018

My first motivation was that the pretty deep nesting was a papercut when I am running mach or git commands, and then that we can now make a clearer difference between Servo-specific WebGL tests and Khronos WebGL tests.
@nox nox force-pushed the webgl branch from 2a13f23 to fb08673 Aug 25, 2018
@nox
Use sdk/tests when syncing from upstream Khronos WebGL tests
Loading status checks…
26a311f
@nox nox force-pushed the webgl branch from fb08673 to 26a311f Aug 25, 2018
@nox
Copy link
Member Author

nox commented Aug 25, 2018

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Aug 25, 2018

⌛ Trying commit 26a311f with merge 6b6fc7d...
bors-servo added a commit that referenced this pull request Aug 25, 2018
@bors-servo
Auto merge of #21519 - servo:webgl, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
6b6fc7d 
Use sdk/tests when syncing from upstream Khronos WebGL 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/21519)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 25, 2018

💔 Test failed - mac-rel-css1
@nox
Copy link
Member Author

nox commented Aug 25, 2018

The failures are just #20734, everything else pass.
@jdm
Copy link
Member

jdm commented Aug 25, 2018

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Aug 25, 2018

📌 Commit 26a311f has been approved by jdm
@highfive highfive assigned jdm and unassigned paulrouget Aug 25, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Aug 25, 2018

⚡ Previous build results for android, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev are reusable. Rebuilding only mac-rel-css1...
@bors-servo
Copy link
Contributor

bors-servo commented Aug 25, 2018

☀️ Test successful - android, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: jdm
Pushing 6b6fc7d to master...
@bors-servo bors-servo merged commit 26a311f into master Aug 25, 2018
2 of 4 checks passed
2 of 4 checks passed
Taskcluster (pull_request) TaskGroup: failure
Details
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
This was referenced Aug 25, 2018
Merged
Merged
Closed
Closed
@jdm jdm mentioned this pull request Sep 24, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdm jdm

Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@nox @highfive @bors-servo @jdm @paulrouget
You can’t perform that action at this time.