| 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 logging | 5 import logging |
| 6 import os | 6 import os |
| 7 import sys | 7 import sys |
| 8 | 8 |
| 9 from gpu_tests import gpu_integration_test | 9 from gpu_tests import gpu_integration_test |
| 10 from gpu_tests import path_util | 10 from gpu_tests import path_util |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 if cls._webgl_version == 1: | 306 if cls._webgl_version == 1: |
| 307 return webgl_conformance_expectations.WebGLConformanceExpectations( | 307 return webgl_conformance_expectations.WebGLConformanceExpectations( |
| 308 conformance_path, url_prefixes=url_prefixes_to_trim, | 308 conformance_path, url_prefixes=url_prefixes_to_trim, |
| 309 is_asan=cls._is_asan) | 309 is_asan=cls._is_asan) |
| 310 else: | 310 else: |
| 311 return webgl2_conformance_expectations.WebGL2ConformanceExpectations( | 311 return webgl2_conformance_expectations.WebGL2ConformanceExpectations( |
| 312 conformance_path, url_prefixes=url_prefixes_to_trim, | 312 conformance_path, url_prefixes=url_prefixes_to_trim, |
| 313 is_asan=cls._is_asan) | 313 is_asan=cls._is_asan) |
| 314 | 314 |
| 315 @classmethod | 315 @classmethod |
| 316 def setUpClass(cls): | 316 def SetUpProcess(cls): |
| 317 super(WebGLConformanceIntegrationTest, cls).setUpClass() | 317 super(WebGLConformanceIntegrationTest, cls).SetUpProcess() |
| 318 cls.CustomizeOptions() | 318 cls.CustomizeOptions() |
| 319 cls.SetBrowserOptions(cls._finder_options) | 319 cls.SetBrowserOptions(cls._finder_options) |
| 320 cls.StartBrowser() | 320 cls.StartBrowser() |
| 321 # By setting multiple server directories, the root of the server | 321 # By setting multiple server directories, the root of the server |
| 322 # implicitly becomes the common base directory, i.e., the Chromium | 322 # implicitly becomes the common base directory, i.e., the Chromium |
| 323 # src dir, and all URLs have to be specified relative to that. | 323 # src dir, and all URLs have to be specified relative to that. |
| 324 cls.SetStaticServerDirs([ | 324 cls.SetStaticServerDirs([ |
| 325 os.path.join(path_util.GetChromiumSrcDir(), conformance_relpath), | 325 os.path.join(path_util.GetChromiumSrcDir(), conformance_relpath), |
| 326 os.path.join(path_util.GetChromiumSrcDir(), extensions_relpath)]) | 326 os.path.join(path_util.GetChromiumSrcDir(), extensions_relpath)]) |
| 327 | 327 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 392 test_paths += cls._ParseTests( | 392 test_paths += cls._ParseTests( |
| 393 include_path, version, webgl2_only, min_version_to_compare) | 393 include_path, version, webgl2_only, min_version_to_compare) |
| 394 else: | 394 else: |
| 395 test = os.path.join(current_dir, test_name) | 395 test = os.path.join(current_dir, test_name) |
| 396 if webgl_version > 1: | 396 if webgl_version > 1: |
| 397 test += '?webglVersion=' + str(webgl_version) | 397 test += '?webglVersion=' + str(webgl_version) |
| 398 test_paths.append(test) | 398 test_paths.append(test) |
| 399 | 399 |
| 400 return test_paths | 400 return test_paths |
| 401 | 401 |
| 402 |
| 402 def load_tests(loader, tests, pattern): | 403 def load_tests(loader, tests, pattern): |
| 403 del loader, tests, pattern # Unused. | 404 del loader, tests, pattern # Unused. |
| 404 return gpu_integration_test.LoadAllTestsInModule(sys.modules[__name__]) | 405 return gpu_integration_test.LoadAllTestsInModule(sys.modules[__name__]) |
| OLD | NEW |