[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aroben at apple.com
aroben at apple.com
Wed Dec 22 16:03:06 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7ba26b796c79dffc522df92d71eebc4760bc8540
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 18 02:30:15 2010 +0000
Don't trigger Windows builds when chromium-win test results change
Reviewed by Mark Rowe.
* Scripts/webkitpy/common/config/build.py:
(_should_file_trigger_build): Changed the regular expression used to
search for directory names to only consider full directory names,
rather than matching directory names where the string we care about is
a suffix of the name.
* Scripts/webkitpy/common/config/build_unittest.py:
(ShouldBuildTest): Added a test.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72269 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b67f9c6..ae0aa79 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-17 Adam Roben <aroben at apple.com>
+
+ Don't trigger Windows builds when chromium-win test results change
+
+ Reviewed by Mark Rowe.
+
+ * Scripts/webkitpy/common/config/build.py:
+ (_should_file_trigger_build): Changed the regular expression used to
+ search for directory names to only consider full directory names,
+ rather than matching directory names where the string we care about is
+ a suffix of the name.
+
+ * Scripts/webkitpy/common/config/build_unittest.py:
+ (ShouldBuildTest): Added a test.
+
2010-11-17 Hayato Ito <hayato at chromium.org>
Reviewed by Shinichiro Hamaji.
diff --git a/WebKitTools/Scripts/webkitpy/common/config/build.py b/WebKitTools/Scripts/webkitpy/common/config/build.py
index b5833ab..c45f122 100644
--- a/WebKitTools/Scripts/webkitpy/common/config/build.py
+++ b/WebKitTools/Scripts/webkitpy/common/config/build.py
@@ -111,7 +111,7 @@ def _should_file_trigger_build(target_platform, file):
# See if the file is in one of the known directories.
for directory, platforms in directories:
- if re.search(r"/?\b%s\b/" % directory, file):
+ if re.search(r"(?:^|/)%s/" % directory, file):
return target_platform in platforms or base_platform in platforms
# See if the file matches a known pattern.
diff --git a/WebKitTools/Scripts/webkitpy/common/config/build_unittest.py b/WebKitTools/Scripts/webkitpy/common/config/build_unittest.py
index c93c91e..3e70ff0 100644
--- a/WebKitTools/Scripts/webkitpy/common/config/build_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/common/config/build_unittest.py
@@ -34,6 +34,7 @@ class ShouldBuildTest(unittest.TestCase):
(["JavaScriptGlue/foo"], ["mac-leopard", "mac-snowleopard"]),
(["LayoutTests/foo"], ["*"]),
(["LayoutTests/platform/chromium-linux/foo"], ["chromium-linux"]),
+ (["LayoutTests/platform/chromium-win/fast/compact/001-expected.txt"], ["chromium-win"]),
(["LayoutTests/platform/mac-leopard/foo"], ["mac-leopard"]),
(["LayoutTests/platform/mac-snowleopard/foo"], ["mac-snowleopard", "win"]),
(["LayoutTests/platform/mac-wk2/Skipped"], ["mac-snowleopard", "win"]),
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list