diff options
author | bors-servo <servo-ops@mozilla.com> | 2020-08-04 14:12:45 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-04 14:12:45 -0400 |
commit | 9fbdbddb0c271db161ff5943cfc1c5c6122f633a (patch) | |
tree | b5c75029bd07a4935e6c06067d74b0aba4a97680 /python | |
parent | 9c59dae708585fc4cb095f87a0161052421597f7 (diff) | |
parent | 75fb6ca589cb97eb933208914a6d2e08ff8dd447 (diff) | |
download | servo-9fbdbddb0c271db161ff5943cfc1c5c6122f633a.tar.gz servo-9fbdbddb0c271db161ff5943cfc1c5c6122f633a.zip |
Auto merge of #27402 - kunalmohan:webgpu-cts, r=jdm
Add a copy of WebGPU CTS to wpt.
<!-- Please describe your changes on the following line: -->
The test suite is generated from `glsl-dependent` branch in https://github.com/gpuweb/cts
We already have 6/44 tests passing and a number of subtests in other tests also pass.
r?@jdm
cc @kvark
---
<!-- 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 #27395 (GitHub issue number if applicable)
<!-- Either: -->
- [X] These changes do not require tests because we don't have tests for tests.
<!-- 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. -->
Diffstat (limited to 'python')
-rw-r--r-- | python/servo/testing_commands.py | 14 | ||||
-rw-r--r-- | python/tidy/servo_tidy/tidy.py | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index f5784ce4f4d..5d05eb60300 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -552,6 +552,8 @@ class MachCommands(CommandBase): elif tracker_api.endswith('/'): tracker_api = tracker_api[0:-1] + if 'test' not in failure: + continue query = urllib.parse.quote(failure['test'], safe='') request = urllib.request.Request("%s/query.py?name=%s" % (tracker_api, query)) search = urllib.request.urlopen(request) @@ -569,9 +571,17 @@ class MachCommands(CommandBase): is_intermittent = data['total_count'] > 0 if is_intermittent: - intermittents.append(failure["output"]) + if 'output' in failure: + intermittents.append(failure["output"]) + else: + intermittents.append("%s [expected %s] %s \n" + % (failure["status"], failure["expected"], failure['test'])) else: - actual_failures.append(failure["output"]) + if 'output' in failure: + actual_failures.append(failure["output"]) + else: + actual_failures.append("%s [expected %s] %s \n" + % (failure["status"], failure["expected"], failure['test'])) def format(outputs, description, file=sys.stdout): formatted = "%s %s:\n%s" % (len(outputs), description, "\n".join(outputs)) diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py index 7501e07d802..a48fb4adc5d 100644 --- a/python/tidy/servo_tidy/tidy.py +++ b/python/tidy/servo_tidy/tidy.py @@ -516,7 +516,7 @@ def check_manifest_dirs(config_file, print_text=True): p = parser.parse(lines) paths = rec_parse(wpt_path("web-platform-tests"), p) for idx, path in enumerate(paths): - if '_mozilla' in path or '_webgl' in path: + if '_mozilla' in path or '_webgl' in path or '_webgpu' in path: continue if not os.path.isdir(path): yield(config_file, idx + 1, "Path in manifest was not found: {}".format(path)) |