| OLD | NEW |
| 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 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 | 256 # Try disabling the GPU watchdog to see if this affects the |
| 257 # intermittent GPU process hangs that have been seen on the | 257 # intermittent GPU process hangs that have been seen on the |
| 258 # waterfall. crbug.com/596622 crbug.com/609252 | 258 # waterfall. crbug.com/596622 crbug.com/609252 |
| 259 '--disable-gpu-watchdog' | 259 '--disable-gpu-watchdog' |
| 260 ]) | 260 ]) |
| 261 if cls._webgl_version == 2: | 261 if cls._webgl_version == 2: |
| 262 browser_options.AppendExtraBrowserArgs([ | 262 browser_options.AppendExtraBrowserArgs([ |
| 263 '--enable-unsafe-es3-apis', | 263 '--enable-es3-apis', |
| 264 ]) | 264 ]) |
| 265 browser = browser_finder.FindBrowser(browser_options.finder_options) | 265 browser = browser_finder.FindBrowser(browser_options.finder_options) |
| 266 if (browser.target_os.startswith('android') and | 266 if (browser.target_os.startswith('android') and |
| 267 browser.browser_type == 'android-webview-shell'): | 267 browser.browser_type == 'android-webview-shell'): |
| 268 # 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 |
| 269 # Nexus 9. It'll go away shortly anyway. crbug.com/499928 | 269 # Nexus 9. It'll go away shortly anyway. crbug.com/499928 |
| 270 # | 270 # |
| 271 # The --ignore_egl_sync_failures is only there to work around | 271 # The --ignore_egl_sync_failures is only there to work around |
| 272 # some strange failure on the Nexus 9 bot, not reproducible on | 272 # some strange failure on the Nexus 9 bot, not reproducible on |
| 273 # local hardware. | 273 # local hardware. |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 365 # 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. |
| 366 test_paths += cls._ParseTests( | 366 test_paths += cls._ParseTests( |
| 367 include_path, version, webgl2_only, min_version_to_compare) | 367 include_path, version, webgl2_only, min_version_to_compare) |
| 368 else: | 368 else: |
| 369 test = os.path.join(current_dir, test_name) | 369 test = os.path.join(current_dir, test_name) |
| 370 if webgl_version > 1: | 370 if webgl_version > 1: |
| 371 test += '?webglVersion=' + str(webgl_version) | 371 test += '?webglVersion=' + str(webgl_version) |
| 372 test_paths.append(test) | 372 test_paths.append(test) |
| 373 | 373 |
| 374 return test_paths | 374 return test_paths |
| OLD | NEW |