| 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 json | 4 import json |
| 5 import optparse | 5 import optparse |
| 6 import os | 6 import os |
| 7 import sys | 7 import sys |
| 8 | 8 |
| 9 import webgl_conformance_expectations | 9 import webgl_conformance_expectations |
| 10 | 10 |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 super(WebglConformancePage, self).__init__( | 85 super(WebglConformancePage, self).__init__( |
| 86 url='file://' + test, page_set=page_set, base_dir=page_set.base_dir, | 86 url='file://' + test, page_set=page_set, base_dir=page_set.base_dir, |
| 87 name=('WebglConformance.%s' % | 87 name=('WebglConformance.%s' % |
| 88 test.replace('/', '_').replace('-', '_'). | 88 test.replace('/', '_').replace('-', '_'). |
| 89 replace('\\', '_').rpartition('.')[0].replace('.', '_'))) | 89 replace('\\', '_').rpartition('.')[0].replace('.', '_'))) |
| 90 self.script_to_evaluate_on_commit = conformance_harness_script | 90 self.script_to_evaluate_on_commit = conformance_harness_script |
| 91 | 91 |
| 92 def RunNavigateSteps(self, action_runner): | 92 def RunNavigateSteps(self, action_runner): |
| 93 action_runner.NavigateToPage(self) | 93 action_runner.NavigateToPage(self) |
| 94 action_runner.WaitForJavaScriptCondition( | 94 action_runner.WaitForJavaScriptCondition( |
| 95 'webglTestHarness._finished', timeout_in_seconds=120) | 95 'webglTestHarness._finished', timeout_in_seconds=180) |
| 96 | 96 |
| 97 | 97 |
| 98 class WebglConformance(benchmark_module.Benchmark): | 98 class WebglConformance(benchmark_module.Benchmark): |
| 99 """Conformance with Khronos WebGL Conformance Tests""" | 99 """Conformance with Khronos WebGL Conformance Tests""" |
| 100 test = WebglConformanceValidator | 100 test = WebglConformanceValidator |
| 101 | 101 |
| 102 @classmethod | 102 @classmethod |
| 103 def AddTestCommandLineArgs(cls, group): | 103 def AddTestCommandLineArgs(cls, group): |
| 104 group.add_option('--webgl-conformance-version', | 104 group.add_option('--webgl-conformance-version', |
| 105 help='Version of the WebGL conformance tests to run.', | 105 help='Version of the WebGL conformance tests to run.', |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 | 160 |
| 161 if '.txt' in test_name: | 161 if '.txt' in test_name: |
| 162 include_path = os.path.join(current_dir, test_name) | 162 include_path = os.path.join(current_dir, test_name) |
| 163 test_paths += WebglConformance._ParseTests( | 163 test_paths += WebglConformance._ParseTests( |
| 164 include_path, version) | 164 include_path, version) |
| 165 else: | 165 else: |
| 166 test = os.path.join(current_dir, test_name) | 166 test = os.path.join(current_dir, test_name) |
| 167 test_paths.append(test) | 167 test_paths.append(test) |
| 168 | 168 |
| 169 return test_paths | 169 return test_paths |
| OLD | NEW |