mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Auto merge of #19065 - MortimerGoro:webgl_wpt, r=jdm
Import WebGL tests separately from web-platform-tests <!-- Please describe your changes on the following line: --> See https://github.com/servo/servo/issues/17140 Changes included in this PR: - Move webgl tests from web-platform-tests to mozilla tests - Create a mach command to allow easy updating from Khronos WebGL upstream ( `./mach update-webgl` or `./mach update-webgl --version 1.0.3`) - Fix WebGL patches to make them compatible with upstream. - Sync with upstream 1.0.3 WebGL conformance suite using the new `./mach update-webgl` command --- <!-- 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 #17140 (github issue number if applicable). <!-- Either: --> - [x] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- 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/19065) <!-- Reviewable:end -->
This commit is contained in:
commit
b74f52d6df
2756 changed files with 53192 additions and 53247 deletions
|
@ -20,6 +20,7 @@ from time import time
|
||||||
import json
|
import json
|
||||||
import urllib2
|
import urllib2
|
||||||
import base64
|
import base64
|
||||||
|
import shutil
|
||||||
|
|
||||||
from mach.registrar import Registrar
|
from mach.registrar import Registrar
|
||||||
from mach.decorators import (
|
from mach.decorators import (
|
||||||
|
@ -929,3 +930,24 @@ testing/web-platform/mozilla/tests for Servo-only tests""" % reference_path)
|
||||||
run_globals = {"__file__": run_file}
|
run_globals = {"__file__": run_file}
|
||||||
execfile(run_file, run_globals)
|
execfile(run_file, run_globals)
|
||||||
return run_globals["update_test_file"](cache_dir)
|
return run_globals["update_test_file"](cache_dir)
|
||||||
|
|
||||||
|
@Command('update-webgl',
|
||||||
|
description='Update the WebGL conformance suite tests from Khronos repo',
|
||||||
|
category='testing')
|
||||||
|
@CommandArgument('--version', action='store_true', default='1.0.3',
|
||||||
|
help='WebGL conformance suite version')
|
||||||
|
def update_webgl(self, version=None):
|
||||||
|
self.ensure_bootstrapped()
|
||||||
|
|
||||||
|
base_dir = path.abspath(path.join(PROJECT_TOPLEVEL_PATH,
|
||||||
|
"tests", "wpt", "mozilla", "tests", "webgl"))
|
||||||
|
run_file = path.join(base_dir, "tools", "import-conformance-tests.py")
|
||||||
|
dest_folder = path.join(base_dir, "conformance-%s" % version)
|
||||||
|
patches_dir = path.join(base_dir, "tools")
|
||||||
|
# Clean dest folder if exists
|
||||||
|
if os.path.exists(dest_folder):
|
||||||
|
shutil.rmtree(dest_folder)
|
||||||
|
|
||||||
|
run_globals = {"__file__": run_file}
|
||||||
|
execfile(run_file, run_globals)
|
||||||
|
return run_globals["update_conformance"](version, dest_folder, None, patches_dir)
|
||||||
|
|
|
@ -53,7 +53,7 @@ FILE_PATTERNS_TO_CHECK = ["*.rs", "*.rc", "*.cpp", "*.c",
|
||||||
"*.yml"]
|
"*.yml"]
|
||||||
|
|
||||||
# File patterns that are ignored for all tidy and lint checks.
|
# File patterns that are ignored for all tidy and lint checks.
|
||||||
FILE_PATTERNS_TO_IGNORE = ["*.#*", "*.pyc", "fake-ld.sh"]
|
FILE_PATTERNS_TO_IGNORE = ["*.#*", "*.pyc", "fake-ld.sh", "*.ogv", "*.webm"]
|
||||||
|
|
||||||
SPEC_BASE_PATH = "components/script/dom/"
|
SPEC_BASE_PATH = "components/script/dom/"
|
||||||
|
|
||||||
|
|
|
@ -70,6 +70,7 @@ directories = [
|
||||||
"./tests/wpt/update",
|
"./tests/wpt/update",
|
||||||
"./tests/wpt/web-platform-tests",
|
"./tests/wpt/web-platform-tests",
|
||||||
"./tests/wpt/mozilla/tests/mozilla/referrer-policy",
|
"./tests/wpt/mozilla/tests/mozilla/referrer-policy",
|
||||||
|
"./tests/wpt/mozilla/tests/webgl",
|
||||||
"./tests/wpt/sync",
|
"./tests/wpt/sync",
|
||||||
"./tests/wpt/sync_css",
|
"./tests/wpt/sync_css",
|
||||||
"./python/tidy/servo_tidy_tests",
|
"./python/tidy/servo_tidy_tests",
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,5 +0,0 @@
|
||||||
[context-attributes-alpha-depth-stencil-antialias.html]
|
|
||||||
type: testharness
|
|
||||||
[WebGL test #95: pixel_1[0\] != 255 && pixel_1[0\] != 0 || pixel_1[0\] == 0 && pixel_2[0\] != 255 && pixel_2[0\] != 0 should be true. Was false.]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
[drawElementsBadArgs.html]
|
|
||||||
type: testharness
|
|
||||||
[WebGL test #0: testDrawElementsVBO]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -0,0 +1,5 @@
|
||||||
|
[context-attributes-alpha-depth-stencil-antialias.html]
|
||||||
|
type: testharness
|
||||||
|
[WebGL test #96: redChannels[0\] != 255 && redChannels[0\] != 0 should be true. Was false.]
|
||||||
|
expected: FAIL
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue