Skip to content

GitLab

T
tangled
Commit 40de9f5d authored by Kai Ninomiya's avatar Kai Ninomiya Committed by Commit Bot
Browse files
Options

Make web_tests pretend the 10.14 Dawn bots are 10.13 

This works around the fact that the 10.14 config is not complete and
doesn't work for [ Mac ] expectations.

Also refactors our test_suites.pyl entries to deduplicate our giant
list of command line flags and tighten down on unnecessary flags on
some systems.

Bug: 984818   # WebGL CTS tracking issue
Bug: 1014785  # Worked-around expectations bug
Change-Id: I215a01a349262cecdf54bcbc6f6c8137b4426f5b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1867990Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707539}
parent 5a487f1d
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 78 deletions
testing/buildbot/chromium.dawn.json
View file @ 40de9f5d
...@@ -143,15 +143,13 @@ ...@@ -143,15 +143,13 @@
}, },
{ {
"args": [ "args": [
"--additional-driver-flag", "--additional-driver-flag=--enable-unsafe-webgpu",
"--enable-unsafe-webgpu",
"--additional-driver-flag",
"--disable-gpu-sandbox",
"--driver-logging", "--driver-logging",
"--ignore-default-expectations", "--ignore-default-expectations",
"--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations", "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
"--isolated-script-test-filter=wpt_internal/webgpu/*", "--isolated-script-test-filter=wpt_internal/webgpu/*",
"--no-xvfb" "--no-xvfb",
"--additional-driver-flag=--disable-gpu-sandbox"
], ],
"isolate_name": "blink_web_tests_exparchive", "isolate_name": "blink_web_tests_exparchive",
"merge": { "merge": {
...@@ -314,15 +312,13 @@ ...@@ -314,15 +312,13 @@
}, },
{ {
"args": [ "args": [
"--additional-driver-flag", "--additional-driver-flag=--enable-unsafe-webgpu",
"--enable-unsafe-webgpu",
"--additional-driver-flag",
"--disable-gpu-sandbox",
"--driver-logging", "--driver-logging",
"--ignore-default-expectations", "--ignore-default-expectations",
"--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations", "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
"--isolated-script-test-filter=wpt_internal/webgpu/*", "--isolated-script-test-filter=wpt_internal/webgpu/*",
"--no-xvfb" "--no-xvfb",
"--additional-driver-flag=--disable-gpu-sandbox"
], ],
"isolate_name": "blink_web_tests_exparchive", "isolate_name": "blink_web_tests_exparchive",
"merge": { "merge": {
...@@ -688,14 +684,12 @@ ...@@ -688,14 +684,12 @@
}, },
{ {
"args": [ "args": [
"--additional-driver-flag", "--additional-driver-flag=--enable-unsafe-webgpu",
"--enable-unsafe-webgpu",
"--additional-driver-flag",
"--disable-gpu-sandbox",
"--driver-logging", "--driver-logging",
"--ignore-default-expectations", "--ignore-default-expectations",
"--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations", "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
"--isolated-script-test-filter=wpt_internal/webgpu/*" "--isolated-script-test-filter=wpt_internal/webgpu/*",
"--platform=mac-mac10.13"
], ],
"isolate_name": "blink_web_tests_exparchive", "isolate_name": "blink_web_tests_exparchive",
"merge": { "merge": {
...@@ -852,14 +846,12 @@ ...@@ -852,14 +846,12 @@
}, },
{ {
"args": [ "args": [
"--additional-driver-flag", "--additional-driver-flag=--enable-unsafe-webgpu",
"--enable-unsafe-webgpu",
"--additional-driver-flag",
"--disable-gpu-sandbox",
"--driver-logging", "--driver-logging",
"--ignore-default-expectations", "--ignore-default-expectations",
"--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations", "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
"--isolated-script-test-filter=wpt_internal/webgpu/*" "--isolated-script-test-filter=wpt_internal/webgpu/*",
"--platform=mac-mac10.13"
], ],
"isolate_name": "blink_web_tests_exparchive", "isolate_name": "blink_web_tests_exparchive",
"merge": { "merge": {
...@@ -1218,16 +1210,13 @@ ...@@ -1218,16 +1210,13 @@
}, },
{ {
"args": [ "args": [
"--additional-driver-flag", "--additional-driver-flag=--enable-unsafe-webgpu",
"--enable-unsafe-webgpu",
"--additional-driver-flag",
"--disable-gpu-sandbox",
"--driver-logging", "--driver-logging",
"--ignore-default-expectations", "--ignore-default-expectations",
"--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations", "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
"-t", "--isolated-script-test-filter=wpt_internal/webgpu/*",
"Release_x64", "--additional-driver-flag=--disable-gpu-sandbox",
"--isolated-script-test-filter=wpt_internal/webgpu/*" "--target=Release_x64"
], ],
"isolate_name": "blink_web_tests_exparchive", "isolate_name": "blink_web_tests_exparchive",
"merge": { "merge": {
...@@ -1389,16 +1378,13 @@ ...@@ -1389,16 +1378,13 @@
}, },
{ {
"args": [ "args": [
"--additional-driver-flag", "--additional-driver-flag=--enable-unsafe-webgpu",
"--enable-unsafe-webgpu",
"--additional-driver-flag",
"--disable-gpu-sandbox",
"--driver-logging", "--driver-logging",
"--ignore-default-expectations", "--ignore-default-expectations",
"--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations", "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
"-t", "--isolated-script-test-filter=wpt_internal/webgpu/*",
"Release_x64", "--additional-driver-flag=--disable-gpu-sandbox",
"--isolated-script-test-filter=wpt_internal/webgpu/*" "--target=Release_x64"
], ],
"isolate_name": "blink_web_tests_exparchive", "isolate_name": "blink_web_tests_exparchive",
"merge": { "merge": {
...@@ -1758,14 +1744,12 @@ ...@@ -1758,14 +1744,12 @@
}, },
{ {
"args": [ "args": [
"--additional-driver-flag", "--additional-driver-flag=--enable-unsafe-webgpu",
"--enable-unsafe-webgpu",
"--additional-driver-flag",
"--disable-gpu-sandbox",
"--driver-logging", "--driver-logging",
"--ignore-default-expectations", "--ignore-default-expectations",
"--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations", "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
"--isolated-script-test-filter=wpt_internal/webgpu/*" "--isolated-script-test-filter=wpt_internal/webgpu/*",
"--additional-driver-flag=--disable-gpu-sandbox"
], ],
"isolate_name": "blink_web_tests_exparchive", "isolate_name": "blink_web_tests_exparchive",
"merge": { "merge": {
...@@ -1927,14 +1911,12 @@ ...@@ -1927,14 +1911,12 @@
}, },
{ {
"args": [ "args": [
"--additional-driver-flag", "--additional-driver-flag=--enable-unsafe-webgpu",
"--enable-unsafe-webgpu",
"--additional-driver-flag",
"--disable-gpu-sandbox",
"--driver-logging", "--driver-logging",
"--ignore-default-expectations", "--ignore-default-expectations",
"--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations", "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
"--isolated-script-test-filter=wpt_internal/webgpu/*" "--isolated-script-test-filter=wpt_internal/webgpu/*",
"--additional-driver-flag=--disable-gpu-sandbox"
], ],
"isolate_name": "blink_web_tests_exparchive", "isolate_name": "blink_web_tests_exparchive",
"merge": { "merge": {
......
testing/buildbot/generate_buildbot_json.py
View file @ 40de9f5d
...@@ -239,6 +239,16 @@ class BBJSONGenerator(object): ...@@ -239,6 +239,16 @@ class BBJSONGenerator(object):
def is_linux(self, tester_config): def is_linux(self, tester_config):
return tester_config.get('os_type') == 'linux' return tester_config.get('os_type') == 'linux'
def is_mac(self, tester_config):
return tester_config.get('os_type') == 'mac'
def is_win(self, tester_config):
return tester_config.get('os_type') == 'win'
def is_win64(self, tester_config):
return (tester_config.get('os_type') == 'win' and
tester_config.get('browser_config') == 'release_x64')
def get_exception_for_test(self, test_name, test_config): def get_exception_for_test(self, test_name, test_config):
# gtests may have both "test" and "name" fields, and usually, if the "name" # gtests may have both "test" and "name" fields, and usually, if the "name"
# field is specified, it means that the same test is being repurposed # field is specified, it means that the same test is being repurposed
...@@ -387,6 +397,9 @@ class BBJSONGenerator(object): ...@@ -387,6 +397,9 @@ class BBJSONGenerator(object):
add_conditional_args('linux_args', self.is_linux) add_conditional_args('linux_args', self.is_linux)
add_conditional_args('android_args', self.is_android) add_conditional_args('android_args', self.is_android)
add_conditional_args('chromeos_args', self.is_chromeos) add_conditional_args('chromeos_args', self.is_chromeos)
add_conditional_args('mac_args', self.is_mac)
add_conditional_args('win_args', self.is_win)
add_conditional_args('win64_args', self.is_win64)
for key in additional_arg_keys or []: for key in additional_arg_keys or []:
args.extend(generated_test.pop(key, [])) args.extend(generated_test.pop(key, []))
......
testing/buildbot/test_suites.pyl
View file @ 40de9f5d
...@@ -4117,35 +4117,22 @@ ...@@ -4117,35 +4117,22 @@
'webgpu_blink_web_tests': { 'webgpu_blink_web_tests': {
'name': 'webgpu_blink_web_tests', 'name': 'webgpu_blink_web_tests',
'args': [ 'args': [
'--additional-driver-flag', '--enable-unsafe-webgpu', '--additional-driver-flag=--enable-unsafe-webgpu',
'--additional-driver-flag', '--disable-gpu-sandbox',
'--driver-logging', '--driver-logging',
'--ignore-default-expectations', '--ignore-default-expectations',
'--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations', '--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations',
'--isolated-script-test-filter=wpt_internal/webgpu/*', '--isolated-script-test-filter=wpt_internal/webgpu/*',
], ],
'linux_args': [ '--no-xvfb' ], 'win_args': [ '--additional-driver-flag=--disable-gpu-sandbox' ],
'merge': { 'win64_args': [ '--target=Release_x64' ],
'args': [ 'mac_args': [
'--verbose', # These tests run on 10.14, but web_tests [ Mac ] expectations don't
], # work correctly yet under 10.14. Pretend it's 10.13.
'script': '//third_party/blink/tools/merge_web_test_results.py', '--platform=mac-mac10.13'
}, ],
'isolate_name': 'blink_web_tests_exparchive', 'linux_args': [
}, '--no-xvfb',
}, '--additional-driver-flag=--disable-gpu-sandbox',
'gpu_webgpu_integration_win_x64_isolated_scripts': {
'webgpu_blink_web_tests': {
'name': 'webgpu_blink_web_tests',
'args': [
'--additional-driver-flag', '--enable-unsafe-webgpu',
'--additional-driver-flag', '--disable-gpu-sandbox',
'--driver-logging',
'--ignore-default-expectations',
'--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations',
'-t', 'Release_x64',
'--isolated-script-test-filter=wpt_internal/webgpu/*',
], ],
'merge': { 'merge': {
'args': [ 'args': [
...@@ -5646,11 +5633,6 @@ ...@@ -5646,11 +5633,6 @@
'gpu_webgpu_integration_isolated_scripts', 'gpu_webgpu_integration_isolated_scripts',
], ],
'gpu_dawn_deps_win_x64_isolated_scripts': [
'gpu_dawn_perf_smoke_isolated_scripts',
'gpu_webgpu_integration_win_x64_isolated_scripts',
],
'gpu_dawn_tot_isolated_scripts': [ 'gpu_dawn_tot_isolated_scripts': [
'gpu_dawn_perf_smoke_isolated_scripts', 'gpu_dawn_perf_smoke_isolated_scripts',
], ],
......
testing/buildbot/waterfalls.pyl
View file @ 40de9f5d
...@@ -1218,7 +1218,7 @@ ...@@ -1218,7 +1218,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_dawn_integration_gtests', 'gtest_tests': 'gpu_dawn_integration_gtests',
'isolated_scripts': 'gpu_dawn_deps_win_x64_isolated_scripts', 'isolated_scripts': 'gpu_dawn_deps_isolated_scripts',
}, },
}, },
'Dawn Win10 x64 DEPS Release (NVIDIA)': { 'Dawn Win10 x64 DEPS Release (NVIDIA)': {
...@@ -1229,7 +1229,7 @@ ...@@ -1229,7 +1229,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_dawn_integration_gtests', 'gtest_tests': 'gpu_dawn_integration_gtests',
'isolated_scripts': 'gpu_dawn_deps_win_x64_isolated_scripts', 'isolated_scripts': 'gpu_dawn_deps_isolated_scripts',
}, },
}, },
'Dawn Win10 x64 Release (Intel HD 630)': { 'Dawn Win10 x64 Release (Intel HD 630)': {
......
third_party/blink/web_tests/WebGPUExpectations
View file @ 40de9f5d
...@@ -28,10 +28,8 @@ crbug.com/1014750 wpt_internal/webgpu/cts.html?q=cts:validation/createView:it+is ...@@ -28,10 +28,8 @@ crbug.com/1014750 wpt_internal/webgpu/cts.html?q=cts:validation/createView:it+is
# #
# Mac (Metal) specific # Mac (Metal) specific
# #
# TODO(crbug.com/1014785): Theses should be [ Mac ], but that doesn't work right now under the mac10.14 config that we run on dawn-mac-x64-deps-rel.
#
crbug.com/1014744 wpt_internal/webgpu/cts.html?q=cts:command_buffer/render/storeop:storeOp+controls+whether+1x1+drawn+quad+is+stored={"storeOp":"clear","expected":0} [ Failure ] crbug.com/1014744 [ Mac ] wpt_internal/webgpu/cts.html?q=cts:command_buffer/render/storeop:storeOp+controls+whether+1x1+drawn+quad+is+stored={"storeOp":"clear","expected":0} [ Failure ]
# #
# Linux (Vulkan) specific # Linux (Vulkan) specific
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment