Title: [111615] trunk/Tools
- Revision
- 111615
- Author
- [email protected]
- Date
- 2012-03-21 15:59:09 -0700 (Wed, 21 Mar 2012)
Log Message
WebKitURLWithTitles pasteboard format should support URLs containing Emoji characters.
https://bugs.webkit.org/show_bug.cgi?id=81835
<rdar://problem/11082749>
Patch by Enrica Casucci <[email protected]> on 2012-03-21
Reviewed by Brady Eidson.
* TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.html:
* TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm:
(TestWebKitAPI::contextMenuCopyLink):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (111614 => 111615)
--- trunk/Tools/ChangeLog 2012-03-21 22:46:49 UTC (rev 111614)
+++ trunk/Tools/ChangeLog 2012-03-21 22:59:09 UTC (rev 111615)
@@ -29,6 +29,25 @@
2012-03-21 Dirk Pranke <[email protected]>
+ fix regression on gtk port introduced by r111609
+ https://bugs.webkit.org/show_bug.cgi?id=81839
+
+ Reviewed by Philippe Normand.
+
+ r111609 should've initialized a couple of missing fields in
+ WebKitDriver, and also should've checked for method overrides
+ in the other ports :(.
+
+ * Scripts/webkitpy/layout_tests/port/gtk.py:
+ (GtkDriver._start):
+ * Scripts/webkitpy/layout_tests/port/webkit.py:
+ (WebKitDriver.__init__):
+ * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+ (MainTest.test_crash_log):
+ (MainTest.test_web_process_crash_log):
+
+2012-03-21 Dirk Pranke <[email protected]>
+
webkitpy: clean up actually getting crash logs from DRT/WTR crashes
https://bugs.webkit.org/show_bug.cgi?id=81603
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py (111614 => 111615)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2012-03-21 22:46:49 UTC (rev 111614)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2012-03-21 22:59:09 UTC (rev 111615)
@@ -54,6 +54,8 @@
environment = self._port.setup_environ_for_server(server_name)
# We must do this here because the DISPLAY number depends on _worker_number
environment['DISPLAY'] = ":%d" % (display_id)
+ self._crashed_process_name = None
+ self._crashed_pid = None
self._server_process = ServerProcess(self._port, server_name, self.cmd_line(pixel_tests, per_test_args), environment)
def stop(self):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (111614 => 111615)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2012-03-21 22:46:49 UTC (rev 111614)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2012-03-21 22:59:09 UTC (rev 111615)
@@ -438,6 +438,7 @@
# and ServerProcess won't be aware of them (since the actual tool
# didn't crash, just a subprocess) we record the crashed subprocess name here.
self._crashed_process_name = None
+ self._crashed_pid = None
# stderr reading is scoped on a per-test (not per-block) basis, so we store the accumulated
# stderr output, as well as if we've seen #EOF on this driver instance.
@@ -506,7 +507,7 @@
elif error_line.startswith("#CRASHED - WebProcess"):
# WebKitTestRunner uses this to report that the WebProcess subprocess crashed.
pid = None
- m = re.match('pid (\d+)', err_line)
+ m = re.match('pid (\d+)', error_line)
if m:
pid = int(m.group(1))
self._crashed_process_name = 'WebProcess'
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (111614 => 111615)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-03-21 22:46:49 UTC (rev 111614)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-03-21 22:59:09 UTC (rev 111615)
@@ -583,6 +583,7 @@
self.assertTrue(host.filesystem.read_text_file('/tmp/layout-test-results/full_results.json').find('"num_regressions":0') != -1)
def test_crash_log(self):
+ # FIXME: Need to rewrite these tests to not be mac-specific, or move them elsewhere.
mock_crash_report = make_mock_crash_report_darwin('DumpRenderTree', 12345)
host = MockHost()
host.filesystem.write_text_file('/Users/mock/Library/Logs/DiagnosticReports/DumpRenderTree_2011-06-13-150719_quadzen.crash', mock_crash_report)
@@ -595,10 +596,11 @@
expected_crash_log = mock_crash_report
# Currently CrashLog uploading only works on Darwin.
if sys.platform != "darwin":
- expected_crash_log = "mock-std-error-output"
+ expected_crash_log = ""
self.assertEquals(host.filesystem.read_text_file('/tmp/layout-test-results/failures/unexpected/crash-with-stderr-crash-log.txt'), expected_crash_log)
def test_web_process_crash_log(self):
+ # FIXME: Need to rewrite these tests to not be mac-specific, or move them elsewhere.
mock_crash_report = make_mock_crash_report_darwin('WebProcess', 12345)
host = MockHost()
host.filesystem.write_text_file('/Users/mock/Library/Logs/DiagnosticReports/WebProcess_2011-06-13-150719_quadzen.crash', mock_crash_report)
@@ -611,7 +613,7 @@
expected_crash_log = mock_crash_report
# Currently CrashLog uploading only works on Darwin.
if sys.platform != "darwin":
- expected_crash_log = "mock-std-error-output"
+ expected_crash_log = ""
self.assertEquals(host.filesystem.read_text_file('/tmp/layout-test-results/failures/unexpected/web-process-crash-with-stderr-crash-log.txt'), expected_crash_log)
def test_exit_after_n_failures_upload(self):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
