OLD | NEW |
---|---|
1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 gpu_process_expectations as expectations | 4 import gpu_process_expectations as expectations |
5 import page_sets | 5 import page_sets |
6 | 6 |
7 from telemetry import benchmark | 7 from telemetry import benchmark |
8 from telemetry.page import page_set | 8 from telemetry.page import page_set |
9 from telemetry.page import page_test | 9 from telemetry.page import page_test |
10 | 10 |
(...skipping 18 matching lines...) Expand all Loading... | |
29 | 29 |
30 def ValidateAndMeasurePage(self, page, tab, results): | 30 def ValidateAndMeasurePage(self, page, tab, results): |
31 has_gpu_process_js = 'chrome.gpuBenchmarking.hasGpuProcess()' | 31 has_gpu_process_js = 'chrome.gpuBenchmarking.hasGpuProcess()' |
32 has_gpu_process = tab.EvaluateJavaScript(has_gpu_process_js) | 32 has_gpu_process = tab.EvaluateJavaScript(has_gpu_process_js) |
33 if not has_gpu_process: | 33 if not has_gpu_process: |
34 raise page_test.Failure('No GPU process detected') | 34 raise page_test.Failure('No GPU process detected') |
35 | 35 |
36 class GpuProcess(benchmark.Benchmark): | 36 class GpuProcess(benchmark.Benchmark): |
37 """Tests that accelerated content triggers the creation of a GPU process""" | 37 """Tests that accelerated content triggers the creation of a GPU process""" |
38 test = _GpuProcessValidator | 38 test = _GpuProcessValidator |
39 page_set = page_sets.GpuProcessTestsPageSet | 39 page_set = page_sets.GpuProcessTestsPageSet |
Ken Russell (switch to Gerrit)
2014/09/13 05:57:12
Could you please instead just delete the page_set
jbroman
2014/09/13 18:57:34
FYI, this will also require changing the name of t
| |
40 | 40 |
41 @classmethod | |
42 def Name(cls): | |
43 return "gpu_process" | |
44 | |
41 def CreateExpectations(self, page_set): | 45 def CreateExpectations(self, page_set): |
42 return expectations.GpuProcessExpectations() | 46 return expectations.GpuProcessExpectations() |
43 | 47 |
44 def CreatePageSet(self, options): | 48 def CreatePageSet(self, options): |
45 page_set = super(GpuProcess, self).CreatePageSet(options) | 49 page_set = super(GpuProcess, self).CreatePageSet(options) |
46 for page in page_set.pages: | 50 for page in page_set.pages: |
47 page.script_to_evaluate_on_commit = test_harness_script | 51 page.script_to_evaluate_on_commit = test_harness_script |
48 return page_set | 52 return page_set |
OLD | NEW |