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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 4861f12dbb566a83aa3be2c0ec30e46ae2b8fae4
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 17 18:13:50 2010 +0000

    Make changes to the Mac WebKit2 Skipped file trigger Windows builds
    
    We use that file on Windows!
    
    Fixes <http://webkit.org/b/49643> Changes to
    LayoutTests/platform/mac-wk2 should trigger a Windows build, but don't
    
    Reviewed by Steve Falkenburg.
    
    * Scripts/webkitpy/common/config/build.py:
    (_should_file_trigger_build): Added the mac-wk2 directory and make it
    trigger builds on SnowLeopard and Windows.
    
    * Scripts/webkitpy/common/config/build_unittest.py:
    (ShouldBuildTest.test_should_build): Added a test.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72218 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f8c3f61..f0aac78 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,21 @@
+2010-11-17  Adam Roben  <aroben at apple.com>
+
+        Make changes to the Mac WebKit2 Skipped file trigger Windows builds
+
+        We use that file on Windows!
+
+        Fixes <http://webkit.org/b/49643> Changes to
+        LayoutTests/platform/mac-wk2 should trigger a Windows build, but don't
+
+        Reviewed by Steve Falkenburg.
+
+        * Scripts/webkitpy/common/config/build.py:
+        (_should_file_trigger_build): Added the mac-wk2 directory and make it
+        trigger builds on SnowLeopard and Windows.
+
+        * Scripts/webkitpy/common/config/build_unittest.py:
+        (ShouldBuildTest.test_should_build): Added a test.
+
 2010-11-17  Satish Sampath  <satish at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebKitTools/Scripts/webkitpy/common/config/build.py b/WebKitTools/Scripts/webkitpy/common/config/build.py
index d938c8e..b5833ab 100644
--- a/WebKitTools/Scripts/webkitpy/common/config/build.py
+++ b/WebKitTools/Scripts/webkitpy/common/config/build.py
@@ -75,6 +75,7 @@ def _should_file_trigger_build(target_platform, file):
         ("mac", ["chromium-mac", "mac"]),
         ("mac-leopard", ["mac-leopard"]),
         ("mac-snowleopard", ["mac-snowleopard"]),
+        ("mac-wk2", ["mac-snowleopard", "win"]),
         ("objc", ["mac"]),
         ("qt", ["qt"]),
         ("skia", ["chromium"]),
diff --git a/WebKitTools/Scripts/webkitpy/common/config/build_unittest.py b/WebKitTools/Scripts/webkitpy/common/config/build_unittest.py
index aa24758..c93c91e 100644
--- a/WebKitTools/Scripts/webkitpy/common/config/build_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/common/config/build_unittest.py
@@ -36,6 +36,7 @@ class ShouldBuildTest(unittest.TestCase):
         (["LayoutTests/platform/chromium-linux/foo"], ["chromium-linux"]),
         (["LayoutTests/platform/mac-leopard/foo"], ["mac-leopard"]),
         (["LayoutTests/platform/mac-snowleopard/foo"], ["mac-snowleopard", "win"]),
+        (["LayoutTests/platform/mac-wk2/Skipped"], ["mac-snowleopard", "win"]),
         (["LayoutTests/platform/mac/foo"], ["mac-leopard", "mac-snowleopard", "win"]),
         (["LayoutTests/platform/win-xp/foo"], ["win"]),
         (["LayoutTests/platform/win-wk2/foo"], ["win"]),

-- 
WebKit Debian packaging