[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 13:57:55 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit fd483b6d0b096e574ea045fa60bf11df300f3cf1
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 30 16:39:52 2010 +0000
Fix path -> URL conversion on Cygwin
Reviewed by Adam Barth.
Fixes <http://webkit.org/b/46890> <rdar://problem/8496637> Many tests
in webkitpy.layout_tests.run_webkit_tests_unittest assert on Windows
* Scripts/webkitpy/layout_tests/port/base.py:
(Port.filename_to_uri): Treat Cygwin like other UNIX-y platforms by
assuming paths already have a leading slash.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68792 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 47ade4d..449ed87 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,18 @@
2010-09-30 Adam Roben <aroben at apple.com>
+ Fix path -> URL conversion on Cygwin
+
+ Reviewed by Adam Barth.
+
+ Fixes <http://webkit.org/b/46890> <rdar://problem/8496637> Many tests
+ in webkitpy.layout_tests.run_webkit_tests_unittest assert on Windows
+
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ (Port.filename_to_uri): Treat Cygwin like other UNIX-y platforms by
+ assuming paths already have a leading slash.
+
+2010-09-30 Adam Roben <aroben at apple.com>
+
Teach WindowGeometryInitializedBeforeSetWindow that NPP_SetWindow can
be called more than once
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
index 6a5d43b..4a4be83 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
@@ -311,7 +311,7 @@ class Port(object):
protocol = "http"
return "%s://127.0.0.1:%u/%s" % (protocol, port, relative_path)
- if sys.platform in ('cygwin', 'win32'):
+ if sys.platform is 'win32':
return "file:///" + self.get_absolute_path(filename)
return "file://" + self.get_absolute_path(filename)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list