| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 import os | 4 import os |
| 5 | 5 |
| 6 from gpu_tests import gpu_test_base | 6 from gpu_tests import gpu_test_base |
| 7 from gpu_tests import path_util | 7 from gpu_tests import path_util |
| 8 from gpu_tests import webgl_conformance_expectations | 8 from gpu_tests import webgl_conformance_expectations |
| 9 from gpu_tests import webgl2_conformance_expectations | 9 from gpu_tests import webgl2_conformance_expectations |
| 10 | 10 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 | 97 |
| 98 def CustomizeBrowserOptions(self, options): | 98 def CustomizeBrowserOptions(self, options): |
| 99 # --test-type=gpu is used only to suppress the "Google API Keys are missing" | 99 # --test-type=gpu is used only to suppress the "Google API Keys are missing" |
| 100 # infobar, which causes flakiness in tests. | 100 # infobar, which causes flakiness in tests. |
| 101 options.AppendExtraBrowserArgs([ | 101 options.AppendExtraBrowserArgs([ |
| 102 '--disable-gesture-requirement-for-media-playback', | 102 '--disable-gesture-requirement-for-media-playback', |
| 103 '--disable-domain-blocking-for-3d-apis', | 103 '--disable-domain-blocking-for-3d-apis', |
| 104 '--disable-gpu-process-crash-limit', | 104 '--disable-gpu-process-crash-limit', |
| 105 '--js-flags=--expose-gc', | 105 '--js-flags=--expose-gc', |
| 106 '--test-type=gpu', | 106 '--test-type=gpu', |
| 107 '--enable-experimental-canvas-features' | 107 '--enable-experimental-canvas-features', |
| 108 '--enable-gpu-benchmarking' |
| 108 ]) | 109 ]) |
| 109 browser = browser_finder.FindBrowser(options.finder_options) | 110 browser = browser_finder.FindBrowser(options.finder_options) |
| 110 if (browser.target_os.startswith('android') and | 111 if (browser.target_os.startswith('android') and |
| 111 browser.browser_type == 'android-webview-shell'): | 112 browser.browser_type == 'android-webview-shell'): |
| 112 # TODO(kbr): this is overly broad. We'd like to do this only on | 113 # TODO(kbr): this is overly broad. We'd like to do this only on |
| 113 # Nexus 9. It'll go away shortly anyway. crbug.com/499928 | 114 # Nexus 9. It'll go away shortly anyway. crbug.com/499928 |
| 114 # | 115 # |
| 115 # The --ignore_egl_sync_failures is only there to work around | 116 # The --ignore_egl_sync_failures is only there to work around |
| 116 # some strange failure on the Nexus 9 bot, not reproducible on | 117 # some strange failure on the Nexus 9 bot, not reproducible on |
| 117 # local hardware. | 118 # local hardware. |
| (...skipping 10 matching lines...) Expand all Loading... |
| 128 def CustomizeBrowserOptions(self, options): | 129 def CustomizeBrowserOptions(self, options): |
| 129 # --test-type=gpu is used only to suppress the "Google API Keys are missing" | 130 # --test-type=gpu is used only to suppress the "Google API Keys are missing" |
| 130 # infobar, which causes flakiness in tests. | 131 # infobar, which causes flakiness in tests. |
| 131 options.AppendExtraBrowserArgs([ | 132 options.AppendExtraBrowserArgs([ |
| 132 '--disable-gesture-requirement-for-media-playback', | 133 '--disable-gesture-requirement-for-media-playback', |
| 133 '--disable-domain-blocking-for-3d-apis', | 134 '--disable-domain-blocking-for-3d-apis', |
| 134 '--disable-gpu-process-crash-limit', | 135 '--disable-gpu-process-crash-limit', |
| 135 '--js-flags=--expose-gc', | 136 '--js-flags=--expose-gc', |
| 136 '--enable-unsafe-es3-apis', | 137 '--enable-unsafe-es3-apis', |
| 137 '--test-type=gpu', | 138 '--test-type=gpu', |
| 138 '--enable-experimental-canvas-features' | 139 '--enable-experimental-canvas-features', |
| 140 '--enable-gpu-benchmarking' |
| 139 ]) | 141 ]) |
| 140 browser = browser_finder.FindBrowser(options.finder_options) | 142 browser = browser_finder.FindBrowser(options.finder_options) |
| 141 if browser.target_os == 'darwin': | 143 if browser.target_os == 'darwin': |
| 142 # crbug.com/539993 | 144 # crbug.com/539993 |
| 143 options.AppendExtraBrowserArgs([ | 145 options.AppendExtraBrowserArgs([ |
| 144 '--disable-accelerated-video-decode' | 146 '--disable-accelerated-video-decode' |
| 145 ]) | 147 ]) |
| 146 | 148 |
| 147 class WebglExtensionPage(gpu_test_base.PageBase): | 149 class WebglExtensionPage(gpu_test_base.PageBase): |
| 148 def __init__(self, story_set, extension, webgl_version, expectations): | 150 def __init__(self, story_set, extension, webgl_version, expectations): |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 # We only check min-version >= 2.0.0 for the top level list. | 361 # We only check min-version >= 2.0.0 for the top level list. |
| 360 test_paths += WebglConformance._ParseTests( | 362 test_paths += WebglConformance._ParseTests( |
| 361 include_path, version, webgl2_only, min_version_to_compare) | 363 include_path, version, webgl2_only, min_version_to_compare) |
| 362 else: | 364 else: |
| 363 test = os.path.join(current_dir, test_name) | 365 test = os.path.join(current_dir, test_name) |
| 364 if webgl_version > 1: | 366 if webgl_version > 1: |
| 365 test += '?webglVersion=' + str(webgl_version) | 367 test += '?webglVersion=' + str(webgl_version) |
| 366 test_paths.append(test) | 368 test_paths.append(test) |
| 367 | 369 |
| 368 return test_paths | 370 return test_paths |
| OLD | NEW |