Commit e73f88b6 authored by Geoff Lang's avatar Geoff Lang Committed by Commit Bot

Skip WebGL texture-switch-performance on debug_x64 as well as debug.

Add a 'debug_x64' and 'release_x64' build type for the Windows bots.

BUG=735483

Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I71adf860a39fb14600c044dca9aeb8bd3bfb33fd
Reviewed-on: https://chromium-review.googlesource.com/579574
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488302}
parent d81201bb
...@@ -31,7 +31,7 @@ OS_CONDITIONS = ['win', 'mac', 'linux', 'chromeos', 'android'] + \ ...@@ -31,7 +31,7 @@ OS_CONDITIONS = ['win', 'mac', 'linux', 'chromeos', 'android'] + \
BROWSER_TYPE_CONDITIONS = [ BROWSER_TYPE_CONDITIONS = [
'android-webview-instrumentation', 'android-content-shell', 'android-webview-instrumentation', 'android-content-shell',
'android-chromium', 'debug', 'release'] 'android-chromium', 'debug', 'debug_x64', 'release', 'release_x64']
ASAN_CONDITIONS = ['asan', 'no_asan'] ASAN_CONDITIONS = ['asan', 'no_asan']
...@@ -91,7 +91,7 @@ class Expectation(object): ...@@ -91,7 +91,7 @@ class Expectation(object):
Browser types: Browser types:
android-webview-instrumentation, android-content-shell, android-webview-instrumentation, android-content-shell,
android-chromium, debug, release android-chromium, debug, debug_x64, release, release_x64
Sample usage in SetExpectations in subclasses: Sample usage in SetExpectations in subclasses:
self.Fail('gl-enable-vertex-attrib.html', self.Fail('gl-enable-vertex-attrib.html',
......
...@@ -113,7 +113,7 @@ class WebGLConformanceExpectations(GpuTestExpectations): ...@@ -113,7 +113,7 @@ class WebGLConformanceExpectations(GpuTestExpectations):
# Don't run performance tests on debug builds # Don't run performance tests on debug builds
self.Skip('conformance/rendering/texture-switch-performance.html', self.Skip('conformance/rendering/texture-switch-performance.html',
['debug']) ['debug', 'debug_x64'], bug=735483)
# Passthrough command decoder # Passthrough command decoder
self.Fail('conformance/extensions/webgl-draw-buffers.html', self.Fail('conformance/extensions/webgl-draw-buffers.html',
......
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