| OLD | NEW |
| 1 # Copyright 2017 The Chromium Authors. All rights reserved. | 1 # Copyright 2017 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 gpu_process_expectations | 10 from gpu_tests import gpu_process_expectations |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 | 78 |
| 79 @classmethod | 79 @classmethod |
| 80 def RestartBrowserIfNecessaryWithArgs(cls, browser_args): | 80 def RestartBrowserIfNecessaryWithArgs(cls, browser_args): |
| 81 if not browser_args: | 81 if not browser_args: |
| 82 browser_args = [] | 82 browser_args = [] |
| 83 if set(browser_args) != cls._last_launched_browser_args: | 83 if set(browser_args) != cls._last_launched_browser_args: |
| 84 logging.info('Restarting browser with arguments: ' + str(browser_args)) | 84 logging.info('Restarting browser with arguments: ' + str(browser_args)) |
| 85 cls.StopBrowser() | 85 cls.StopBrowser() |
| 86 cls.CustomizeBrowserArgs(browser_args) | 86 cls.CustomizeBrowserArgs(browser_args) |
| 87 cls.StartBrowser() | 87 cls.StartBrowser() |
| 88 cls.tab = cls.browser.tabs[0] | |
| 89 | 88 |
| 90 @classmethod | 89 @classmethod |
| 91 def _CreateExpectations(cls): | 90 def _CreateExpectations(cls): |
| 92 return gpu_process_expectations.GpuProcessExpectations() | 91 return gpu_process_expectations.GpuProcessExpectations() |
| 93 | 92 |
| 94 @classmethod | 93 @classmethod |
| 95 def GenerateGpuTests(cls, options): | 94 def GenerateGpuTests(cls, options): |
| 96 # The browser test runner synthesizes methods with the exact name | 95 # The browser test runner synthesizes methods with the exact name |
| 97 # given in GenerateGpuTests, so in order to hand-write our tests but | 96 # given in GenerateGpuTests, so in order to hand-write our tests but |
| 98 # also go through the _RunGpuTest trampoline, the test needs to be | 97 # also go through the _RunGpuTest trampoline, the test needs to be |
| (...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 def _GpuProcess_software_gpu_process(self, test_path): | 518 def _GpuProcess_software_gpu_process(self, test_path): |
| 520 # Hit exception from id 50 from kSoftwareRenderingListJson. | 519 # Hit exception from id 50 from kSoftwareRenderingListJson. |
| 521 self.RestartBrowserIfNecessaryWithArgs([ | 520 self.RestartBrowserIfNecessaryWithArgs([ |
| 522 '--gpu-testing-vendor-id=0x10de', | 521 '--gpu-testing-vendor-id=0x10de', |
| 523 '--gpu-testing-device-id=0x0de1', | 522 '--gpu-testing-device-id=0x0de1', |
| 524 '--gpu-testing-gl-vendor=VMware', | 523 '--gpu-testing-gl-vendor=VMware', |
| 525 '--gpu-testing-gl-renderer=SVGA3D', | 524 '--gpu-testing-gl-renderer=SVGA3D', |
| 526 '--gpu-testing-gl-version=2.1 Mesa 10.1']) | 525 '--gpu-testing-gl-version=2.1 Mesa 10.1']) |
| 527 self._Navigate(test_path) | 526 self._Navigate(test_path) |
| 528 self._VerifyGpuProcessPresent() | 527 self._VerifyGpuProcessPresent() |
| OLD | NEW |