[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
dpranke at chromium.org
dpranke at chromium.org
Wed Dec 22 13:43:32 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 10fa5f3f532b0f2c029c4c059f45ce71c1459edf
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 24 03:57:16 2010 +0000
2010-09-23 Dirk Pranke <dpranke at chromium.org>
Unreviewed, build fix.
r68008 broke new-run-webkit-tests in that the chromium ports no
longer respect set-webkit-configuration. The correct fix for this
is being pursued in bug 46278 (along with a bunch of unit tests),
but in the meantime I'm reverting the particular lines that broke
things. This was tested by hand.
* Scripts/webkitpy/layout_tests/port/chromium.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68232 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 183e17b..3f09e83 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-23 Dirk Pranke <dpranke at chromium.org>
+
+ Unreviewed, build fix.
+
+ r68008 broke new-run-webkit-tests in that the chromium ports no
+ longer respect set-webkit-configuration. The correct fix for this
+ is being pursued in bug 46278 (along with a bunch of unit tests),
+ but in the meantime I'm reverting the particular lines that broke
+ things. This was tested by hand.
+
+ * Scripts/webkitpy/layout_tests/port/chromium.py:
+
2010-09-23 Sam Weinig <sam at webkit.org>
Reviewed by Anders Carlsson.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
index 4f3d734..f22e4ae 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -83,10 +83,11 @@ class ChromiumPort(base.Port):
"""Abstract base class for Chromium implementations of the Port class."""
def __init__(self, **kwargs):
+ import pdb
+ pdb.set_trace()
if 'options' in kwargs:
options = kwargs['options']
- if (options and (not hasattr(options, 'configuration') or
- options.configuration is None)):
+ if (options and not hasattr(options, 'configuration')):
options.configuration = 'Release'
base.Port.__init__(self, **kwargs)
self._chromium_base_dir = None
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list