2010-10-29 Dirk Pranke <dpranke@chromium.org>

        Reviewed by Ojan Vafai.

        new-run-webkit-tests: need to provide separate dashboard results for GPU tests
        https://bugs.webkit.org/show_bug.cgi?id=48687

        Modify the steps to upload the JSON files to the dashboards so
        that the GPU tests don't conflict with the regular tests on a
        port. We do this by modifying the --builder-name parameter to
        append " - GPU", which should cause the app to treat the results
        as a completely new builder. This is a little non-obvious, but
        keeps us from having to restructure the app.

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

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70942 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d194c3792fcebe35bc8fbc9d2c5fd0202e42130f..08fb07a409cc8175530e37b1d304f0e01f30abe1 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-29  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        new-run-webkit-tests: need to provide separate dashboard results for GPU tests
+        https://bugs.webkit.org/show_bug.cgi?id=48687
+
+        Modify the steps to upload the JSON files to the dashboards so
+        that the GPU tests don't conflict with the regular tests on a
+        port. We do this by modifying the --builder-name parameter to
+        append " - GPU", which should cause the app to treat the results
+        as a completely new builder. This is a little non-obvious, but
+        keeps us from having to restructure the app.
+
+        * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
+        * Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2010-10-29  Ojan Vafai  <ojan@chromium.org>
 
         Reviewed by Tony Chang.

diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py
index 95c716ef28862d2b08496f2121be8fd14fe0db69..5d28faed339a3e9707d98e3cd15582d45504d06e 100644 (file)
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py
@@ -69,6 +69,8 @@ def _set_gpu_options(options):
             options.accelerated_compositing = True
         if options.accelerated_2d_canvas is None:
             options.accelerated_2d_canvas = True
+        if options.builder_name is not None:
+            options.builder_name = options.builder_name + ' - GPU'
 
 
 def _gpu_overrides(port):

diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py
index 7a13b1cfa3a70c7a6ab1b8bffb434bfb552fd496..88524fc415874919faefb3faad5459adc2d523ce 100644 (file)
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py
@@ -44,10 +44,12 @@ class ChromiumGpuTest(unittest.TestCase):
     def assertOverridesWorked(self, port_name):
         # test that we got the right port
         mock_options = mocktool.MockOptions(accelerated_compositing=None,
-                                            accelerated_2d_canvas=None)
+                                            accelerated_2d_canvas=None,
+                                            builder_name='foo')
         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.assertEqual(port._options.builder_name, 'foo - GPU')
 
         # we use startswith() instead of Equal to gloss over platform versions.
         self.assertTrue(port.name().startswith(port_name))