Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(377)

Side by Side Diff: content/test/gpu/gpu_tests/webgl_conformance_integration_test.py

Issue 2446033002: Try disabling GPU watchdog in WebGL conformance tests. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import os 5 import os
6 6
7 from gpu_tests import gpu_integration_test 7 from gpu_tests import gpu_integration_test
8 from gpu_tests import path_util 8 from gpu_tests import path_util
9 from gpu_tests import webgl_conformance_expectations 9 from gpu_tests import webgl_conformance_expectations
10 from gpu_tests import webgl2_conformance_expectations 10 from gpu_tests import webgl2_conformance_expectations
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 assert cls._webgl_version == 1 or cls._webgl_version == 2 245 assert cls._webgl_version == 1 or cls._webgl_version == 2
246 browser_options = cls._finder_options.browser_options 246 browser_options = cls._finder_options.browser_options
247 # --test-type=gpu is used only to suppress the "Google API Keys are missing" 247 # --test-type=gpu is used only to suppress the "Google API Keys are missing"
248 # infobar, which causes flakiness in tests. 248 # infobar, which causes flakiness in tests.
249 browser_options.AppendExtraBrowserArgs([ 249 browser_options.AppendExtraBrowserArgs([
250 '--disable-gesture-requirement-for-media-playback', 250 '--disable-gesture-requirement-for-media-playback',
251 '--disable-domain-blocking-for-3d-apis', 251 '--disable-domain-blocking-for-3d-apis',
252 '--disable-gpu-process-crash-limit', 252 '--disable-gpu-process-crash-limit',
253 '--js-flags=--expose-gc', 253 '--js-flags=--expose-gc',
254 '--test-type=gpu', 254 '--test-type=gpu',
255 '--enable-experimental-canvas-features' 255 '--enable-experimental-canvas-features',
256 # Try disabling the GPU watchdog to see if this affects the
257 # intermittent GPU process hangs that have been seen on the
258 # waterfall. crbug.com/596622 crbug.com/609252
259 '--disable-gpu-watchdog'
256 ]) 260 ])
257 if cls._webgl_version == 2: 261 if cls._webgl_version == 2:
258 browser_options.AppendExtraBrowserArgs([ 262 browser_options.AppendExtraBrowserArgs([
259 '--enable-unsafe-es3-apis', 263 '--enable-unsafe-es3-apis',
260 ]) 264 ])
261 browser = browser_finder.FindBrowser(browser_options.finder_options) 265 browser = browser_finder.FindBrowser(browser_options.finder_options)
262 if (browser.target_os.startswith('android') and 266 if (browser.target_os.startswith('android') and
263 browser.browser_type == 'android-webview-shell'): 267 browser.browser_type == 'android-webview-shell'):
264 # TODO(kbr): this is overly broad. We'd like to do this only on 268 # TODO(kbr): this is overly broad. We'd like to do this only on
265 # Nexus 9. It'll go away shortly anyway. crbug.com/499928 269 # Nexus 9. It'll go away shortly anyway. crbug.com/499928
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 # We only check min-version >= 2.0.0 for the top level list. 365 # We only check min-version >= 2.0.0 for the top level list.
362 test_paths += cls._ParseTests( 366 test_paths += cls._ParseTests(
363 include_path, version, webgl2_only, min_version_to_compare) 367 include_path, version, webgl2_only, min_version_to_compare)
364 else: 368 else:
365 test = os.path.join(current_dir, test_name) 369 test = os.path.join(current_dir, test_name)
366 if webgl_version > 1: 370 if webgl_version > 1:
367 test += '?webglVersion=' + str(webgl_version) 371 test += '?webglVersion=' + str(webgl_version)
368 test_paths.append(test) 372 test_paths.append(test)
369 373
370 return test_paths 374 return test_paths
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698