Commit bd7b1d6b authored by Brian Sheedy's avatar Brian Sheedy Committed by Commit Bot

Remove GLES conform tests from SkDawn builder

Switches the SkiaRenderer Dawn builders to use the 'gpu_tests' mixin
instead of 'gpu_fyi_tests', as the FYI version causes them to attempt
to build ANGLE conformance tests. These tests aren't necessary on this
configuration, and are currently failing to build.

Bug: 1046947
Change-Id: I7aed86f11f359de966bc47a896c392f247812246
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2028739
Auto-Submit: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: default avatarYuly Novikov <ynovikov@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737059}
parent 4c26a82d
...@@ -419,7 +419,7 @@ ...@@ -419,7 +419,7 @@
'GPU FYI Win x64 DX12 Vulkan Builder (dbg)': 'gpu_fyi_tests_dx12vk_debug_trybot', 'GPU FYI Win x64 DX12 Vulkan Builder (dbg)': 'gpu_fyi_tests_dx12vk_debug_trybot',
'GPU FYI XR Win x64 Builder': 'gpu_fyi_tests_release_trybot', 'GPU FYI XR Win x64 Builder': 'gpu_fyi_tests_release_trybot',
'Linux FYI GPU TSAN Release': 'gpu_fyi_tests_release_trybot_tsan', 'Linux FYI GPU TSAN Release': 'gpu_fyi_tests_release_trybot_tsan',
'Linux FYI SkiaRenderer Dawn Release (Intel HD 630)': 'gpu_fyi_tests_sk_dawn_release_trybot', 'Linux FYI SkiaRenderer Dawn Release (Intel HD 630)': 'gpu_tests_sk_dawn_release_trybot',
'Mac FYI GPU ASAN Release': 'gpu_fyi_tests_release_trybot_asan', 'Mac FYI GPU ASAN Release': 'gpu_fyi_tests_release_trybot_asan',
'Optional Android Release (Nexus 5X)': 'gpu_tests_android_release_trybot_arm64', 'Optional Android Release (Nexus 5X)': 'gpu_tests_android_release_trybot_arm64',
}, },
...@@ -810,7 +810,7 @@ ...@@ -810,7 +810,7 @@
'gpu-fyi-try-linux-intel-dqp': 'deqp_release_trybot', 'gpu-fyi-try-linux-intel-dqp': 'deqp_release_trybot',
'gpu-fyi-try-linux-intel-exp': 'gpu_fyi_tests_release_trybot', 'gpu-fyi-try-linux-intel-exp': 'gpu_fyi_tests_release_trybot',
'gpu-fyi-try-linux-intel-rel': 'gpu_fyi_tests_release_trybot', 'gpu-fyi-try-linux-intel-rel': 'gpu_fyi_tests_release_trybot',
'gpu-fyi-try-linux-intel-sk-dawn-rel': 'gpu_fyi_tests_sk_dawn_release_trybot', 'gpu-fyi-try-linux-intel-sk-dawn-rel': 'gpu_tests_sk_dawn_release_trybot',
'gpu-fyi-try-linux-intel-skv': 'gpu_fyi_tests_release_trybot', 'gpu-fyi-try-linux-intel-skv': 'gpu_fyi_tests_release_trybot',
'gpu-fyi-try-linux-nvidia-dbg': 'gpu_fyi_tests_debug_trybot', 'gpu-fyi-try-linux-nvidia-dbg': 'gpu_fyi_tests_debug_trybot',
'gpu-fyi-try-linux-nvidia-dqp': 'deqp_release_trybot', 'gpu-fyi-try-linux-nvidia-dqp': 'deqp_release_trybot',
...@@ -1634,10 +1634,6 @@ ...@@ -1634,10 +1634,6 @@
'gpu_fyi_tests', 'dx12vk', 'release_trybot', 'gpu_fyi_tests', 'dx12vk', 'release_trybot',
], ],
'gpu_fyi_tests_sk_dawn_release_trybot': [
'gpu_fyi_tests', 'sk_dawn', 'release_trybot',
],
'gpu_tests_android_release_bot_minimal_symbols_arm64_fastbuild': [ 'gpu_tests_android_release_bot_minimal_symbols_arm64_fastbuild': [
'gpu_tests', 'android', 'release_bot', 'minimal_symbols', 'arm64', 'gpu_tests', 'android', 'release_bot', 'minimal_symbols', 'arm64',
'resource_whitelisting', 'static_angle', 'android_fastbuild', 'webview_google', 'resource_whitelisting', 'static_angle', 'android_fastbuild', 'webview_google',
...@@ -1759,6 +1755,10 @@ ...@@ -1759,6 +1755,10 @@
'gpu_tests', 'release_bot', 'gpu_tests', 'release_bot',
], ],
'gpu_tests_sk_dawn_release_trybot': [
'gpu_tests', 'sk_dawn', 'release_trybot',
],
'gn_linux_upload': [ 'gn_linux_upload': [
'gn_linux_upload', 'official', 'goma', 'gn_linux_upload', 'official', 'goma',
], ],
......
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