| 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 class WebglConformancePage(page_module.Page): | 81 class WebglConformancePage(page_module.Page): |
| 82 def __init__(self, page_set, test): | 82 def __init__(self, page_set, test): |
| 83 super(WebglConformancePage, self).__init__( | 83 super(WebglConformancePage, self).__init__( |
| 84 url='file://' + test, page_set=page_set, base_dir=page_set.base_dir, | 84 url='file://' + test, page_set=page_set, base_dir=page_set.base_dir, |
| 85 name=('WebglConformance.%s' % | 85 name=('WebglConformance.%s' % |
| 86 test.replace('/', '_').replace('-', '_'). | 86 test.replace('/', '_').replace('-', '_'). |
| 87 replace('\\', '_').rpartition('.')[0].replace('.', '_'))) | 87 replace('\\', '_').rpartition('.')[0].replace('.', '_'))) |
| 88 self.script_to_evaluate_on_commit = conformance_harness_script | 88 self.script_to_evaluate_on_commit = conformance_harness_script |
| 89 | 89 |
| 90 def RunNavigateSteps(self, action_runner): | 90 def RunNavigateSteps(self, action_runner): |
| 91 action_runner.RunAction(NavigateAction()) | 91 action_runner.NavigateToPage(self) |
| 92 action_runner.RunAction(WaitAction( | 92 action_runner.RunAction(WaitAction( |
| 93 {'javascript': 'webglTestHarness._finished', 'timeout': 120})) | 93 {'javascript': 'webglTestHarness._finished', 'timeout': 120})) |
| 94 | 94 |
| 95 | 95 |
| 96 class WebglConformance(test_module.Test): | 96 class WebglConformance(test_module.Test): |
| 97 """Conformance with Khronos WebGL Conformance Tests""" | 97 """Conformance with Khronos WebGL Conformance Tests""" |
| 98 test = WebglConformanceValidator | 98 test = WebglConformanceValidator |
| 99 | 99 |
| 100 @classmethod | 100 @classmethod |
| 101 def AddTestCommandLineArgs(cls, group): | 101 def AddTestCommandLineArgs(cls, group): |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 | 159 |
| 160 if '.txt' in test_name: | 160 if '.txt' in test_name: |
| 161 include_path = os.path.join(current_dir, test_name) | 161 include_path = os.path.join(current_dir, test_name) |
| 162 test_paths += WebglConformance._ParseTests( | 162 test_paths += WebglConformance._ParseTests( |
| 163 include_path, version) | 163 include_path, version) |
| 164 else: | 164 else: |
| 165 test = os.path.join(current_dir, test_name) | 165 test = os.path.join(current_dir, test_name) |
| 166 test_paths.append(test) | 166 test_paths.append(test) |
| 167 | 167 |
| 168 return test_paths | 168 return test_paths |
| OLD | NEW |