Commit af1b8a2a authored by dpranke@chromium.org's avatar dpranke@chromium.org

2010-11-01 Dirk Pranke <dpranke@chromium.org>

        Reviewed by James Robinson.

        new-run-webkit-tests: use DRT, child-processes=1 for GPU tests by default
        https://bugs.webkit.org/show_bug.cgi?id=48790

        * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
        * Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71068 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 0cf2782f
2010-11-01 Dirk Pranke <dpranke@chromium.org>
Reviewed by James Robinson.
new-run-webkit-tests: use DRT, child-processes=1 for GPU tests by default
https://bugs.webkit.org/show_bug.cgi?id=48790
* Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
* Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:
2010-11-01 Adam Barth <abarth@webkit.org>
Reviewed by Eric Seidel.
......
......@@ -71,6 +71,8 @@ def _set_gpu_options(options):
options.accelerated_2d_canvas = True
if options.builder_name is not None:
options.builder_name = options.builder_name + ' - GPU'
if options.use_drt is None:
options.use_drt = True
def _gpu_overrides(port):
......@@ -96,6 +98,9 @@ class ChromiumGpuLinuxPort(chromium_linux.ChromiumLinuxPort):
return (map(self._webkit_baseline_path, ['chromium-gpu-linux', 'chromium-gpu-win', 'chromium-gpu']) +
chromium_linux.ChromiumLinuxPort.baseline_search_path(self))
def default_child_processes(self):
return 1
def path_to_test_expectations_file(self):
return self.path_from_webkit_base('LayoutTests', 'platform',
'chromium-gpu', 'test_expectations.txt')
......@@ -114,6 +119,9 @@ class ChromiumGpuMacPort(chromium_mac.ChromiumMacPort):
return (map(self._webkit_baseline_path, ['chromium-gpu-mac', 'chromium-gpu']) +
chromium_mac.ChromiumMacPort.baseline_search_path(self))
def default_child_processes(self):
return 1
def path_to_test_expectations_file(self):
return self.path_from_webkit_base('LayoutTests', 'platform',
'chromium-gpu', 'test_expectations.txt')
......@@ -132,6 +140,9 @@ class ChromiumGpuWinPort(chromium_win.ChromiumWinPort):
return (map(self._webkit_baseline_path, ['chromium-gpu-win', 'chromium-gpu']) +
chromium_win.ChromiumWinPort.baseline_search_path(self))
def default_child_processes(self):
return 1
def path_to_test_expectations_file(self):
return self.path_from_webkit_base('LayoutTests', 'platform',
'chromium-gpu', 'test_expectations.txt')
......
......@@ -45,10 +45,14 @@ class ChromiumGpuTest(unittest.TestCase):
# test that we got the right port
mock_options = mocktool.MockOptions(accelerated_compositing=None,
accelerated_2d_canvas=None,
builder_name='foo')
builder_name='foo',
use_drt=None,
child_processes=None)
port = chromium_gpu.get(port_name=port_name, options=mock_options)
self.assertTrue(port._options.accelerated_compositing)
self.assertTrue(port._options.accelerated_2d_canvas)
self.assertTrue(port._options.use_drt)
self.assertEqual(port.default_child_processes(), 1)
self.assertEqual(port._options.builder_name, 'foo - GPU')
# we use startswith() instead of Equal to gloss over platform versions.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment