[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[dpranke at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 9ee4a1a93f47a5cbe68398d5b26519e0032fb001
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 29 22:44:57 2010 +0000

    2010-10-29  Dirk Pranke  <dpranke at 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 d194c37..08fb07a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-29  Dirk Pranke  <dpranke at 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 at 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 95c716e..5d28fae 100644
--- 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 7a13b1c..88524fc 100644
--- 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))

-- 
WebKit Debian packaging