Chromium Code Reviews| 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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 133 shared_page_state_class=gpu_test_base.DesktopGpuSharedPageState, | 133 shared_page_state_class=gpu_test_base.DesktopGpuSharedPageState, |
| 134 name=('WebglConformance.%s' % | 134 name=('WebglConformance.%s' % |
| 135 test.replace('/', '_').replace('-', '_'). | 135 test.replace('/', '_').replace('-', '_'). |
| 136 replace('\\', '_').rpartition('.')[0].replace('.', '_')), | 136 replace('\\', '_').rpartition('.')[0].replace('.', '_')), |
| 137 expectations=expectations) | 137 expectations=expectations) |
| 138 self.script_to_evaluate_on_commit = conformance_harness_script | 138 self.script_to_evaluate_on_commit = conformance_harness_script |
| 139 | 139 |
| 140 def RunNavigateSteps(self, action_runner): | 140 def RunNavigateSteps(self, action_runner): |
| 141 super(WebglConformancePage, self).RunNavigateSteps(action_runner) | 141 super(WebglConformancePage, self).RunNavigateSteps(action_runner) |
| 142 action_runner.WaitForJavaScriptCondition( | 142 action_runner.WaitForJavaScriptCondition( |
| 143 'webglTestHarness._finished', timeout_in_seconds=180) | 143 'webglTestHarness._finished', timeout_in_seconds=300) |
|
nednguyen
2016/03/11 01:35:03
Not my codebase but I think maybe the better way
Ken Russell (switch to Gerrit)
2016/03/14 20:23:26
I'm not sure how that would be implemented -- ther
| |
| 144 | 144 |
| 145 class WebglConformance(gpu_test_base.TestBase): | 145 class WebglConformance(gpu_test_base.TestBase): |
| 146 """Conformance with Khronos WebGL Conformance Tests""" | 146 """Conformance with Khronos WebGL Conformance Tests""" |
| 147 def __init__(self): | 147 def __init__(self): |
| 148 super(WebglConformance, self).__init__(max_failures=10) | 148 super(WebglConformance, self).__init__(max_failures=10) |
| 149 self._cached_expectations = None | 149 self._cached_expectations = None |
| 150 self._webgl_version = 0 | 150 self._webgl_version = 0 |
| 151 | 151 |
| 152 @classmethod | 152 @classmethod |
| 153 def Name(cls): | 153 def Name(cls): |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 242 # We only check min-version >= 2.0.0 for the top level list. | 242 # We only check min-version >= 2.0.0 for the top level list. |
| 243 test_paths += WebglConformance._ParseTests( | 243 test_paths += WebglConformance._ParseTests( |
| 244 include_path, version, webgl2_only, min_version_to_compare) | 244 include_path, version, webgl2_only, min_version_to_compare) |
| 245 else: | 245 else: |
| 246 test = os.path.join(current_dir, test_name) | 246 test = os.path.join(current_dir, test_name) |
| 247 if webgl_version > 1: | 247 if webgl_version > 1: |
| 248 test += '?webglVersion=' + str(webgl_version) | 248 test += '?webglVersion=' + str(webgl_version) |
| 249 test_paths.append(test) | 249 test_paths.append(test) |
| 250 | 250 |
| 251 return test_paths | 251 return test_paths |
| OLD | NEW |