Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(225)

Side by Side Diff: content/test/gpu/gpu_tests/pixel_integration_test.py

Issue 2607073002: Fold the GPU rasterization tests into the pixel tests step. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 import glob 4 import glob
5 import logging 5 import logging
6 import os 6 import os
7 import re 7 import re
8 import sys 8 import sys
9 9
10 from gpu_tests import cloud_storage_integration_test_base 10 from gpu_tests import cloud_storage_integration_test_base
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 107
108 @classmethod 108 @classmethod
109 def _CreateExpectations(cls): 109 def _CreateExpectations(cls):
110 return pixel_expectations.PixelExpectations() 110 return pixel_expectations.PixelExpectations()
111 111
112 @classmethod 112 @classmethod
113 def GenerateGpuTests(cls, options): 113 def GenerateGpuTests(cls, options):
114 cls.SetParsedCommandLineOptions(options) 114 cls.SetParsedCommandLineOptions(options)
115 name = 'Pixel' 115 name = 'Pixel'
116 pages = pixel_test_pages.DefaultPages(name) 116 pages = pixel_test_pages.DefaultPages(name)
117 pages += pixel_test_pages.GpuRasterizationPages(name)
117 pages += pixel_test_pages.ExperimentalCanvasFeaturesPages(name) 118 pages += pixel_test_pages.ExperimentalCanvasFeaturesPages(name)
118 if sys.platform.startswith('darwin'): 119 if sys.platform.startswith('darwin'):
119 pages += pixel_test_pages.MacSpecificPages(name) 120 pages += pixel_test_pages.MacSpecificPages(name)
120 for p in pages: 121 for p in pages:
121 yield(p.name, p.url, (p)) 122 yield(p.name, p.url, (p))
122 123
123 def RunActualGpuTest(self, test_path, *args): 124 def RunActualGpuTest(self, test_path, *args):
124 page = args[0] 125 page = args[0]
125 # Some pixel tests require non-standard browser arguments. Need to 126 # Some pixel tests require non-standard browser arguments. Need to
126 # check before running each page that it can run in the current 127 # check before running each page that it can run in the current
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 ref_png = None 220 ref_png = None
220 221
221 if ref_png is not None: 222 if ref_png is not None:
222 return ref_png 223 return ref_png
223 224
224 print ('Reference image not found. Writing tab contents as reference to: ' + 225 print ('Reference image not found. Writing tab contents as reference to: ' +
225 image_path) 226 image_path)
226 227
227 self._WriteImage(image_path, screenshot) 228 self._WriteImage(image_path, screenshot)
228 return screenshot 229 return screenshot
OLDNEW
« no previous file with comments | « content/test/gpu/gpu_tests/pixel_expectations.py ('k') | content/test/gpu/gpu_tests/pixel_test_pages.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698