[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 f81162f95f43bb2007ae67deb614479d12a42ad8
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 17 02:24:42 2010 +0000

    2010-11-16  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Ojan Vafai.
    
            See Chromium issue http://codereview.chromium.org/5133001/ - we
            are modifying the build bots to pass in the builder name with
            the "GPU" string appended instead of appending it in the code.
    
            https://bugs.webkit.org/show_bug.cgi?id=49636
    
            * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72156 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2274fee..0aed142 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-16  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        See Chromium issue http://codereview.chromium.org/5133001/ - we
+        are modifying the build bots to pass in the builder name with
+        the "GPU" string appended instead of appending it in the code.
+
+        https://bugs.webkit.org/show_bug.cgi?id=49636
+
+        * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
+
 2010-11-16  Steve Falkenburg  <sfalken at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py
index 57b6989..54a0fee 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py
@@ -69,11 +69,14 @@ 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'
         if options.use_drt is None:
             options.use_drt = True
 
+        # FIXME: Remove this after http://codereview.chromium.org/5133001/ is enabled
+        # on the bots.
+        if options.builder_name is not None and not ' - GPU' in options.builder_name:
+            options.builder_name = options.builder_name + ' - GPU'
+
 
 def _gpu_overrides(port):
     try:

-- 
WebKit Debian packaging