Modified: trunk/Tools/ChangeLog (278082 => 278083)
--- trunk/Tools/ChangeLog 2021-05-26 15:15:22 UTC (rev 278082)
+++ trunk/Tools/ChangeLog 2021-05-26 15:23:48 UTC (rev 278083)
@@ -1,3 +1,17 @@
+2021-05-26 Jonathan Bedard <jbed...@apple.com>
+
+ [test-lldb-webkit] Update for Xcode 12.5
+ https://bugs.webkit.org/show_bug.cgi?id=226115
+ <rdar://problem/78331664>
+
+ Reviewed by Darin Adler.
+
+ * lldb/lldb_webkit_unittest.py:
+ (TestSummaryProviders.serial_test_WTFStringImpl_SummaryProvider_8bit_string): Use unicode directly.
+ (TestSummaryProviders.serial_test_WTFStringImpl_SummaryProvider_16bit_string): Ditto.
+ (TestSummaryProviders.serial_test_WTFString_SummaryProvider_8bit_string): Ditto.
+ (TestSummaryProviders.serial_test_WTFString_SummaryProvider_16bit_string): Ditto.
+
2021-05-26 Sam Sneddon <gsnedd...@apple.com>
Fix remaining test-webkitpy{,-python2} --all --integration-tests failures
Modified: trunk/Tools/lldb/lldb_webkit_unittest.py (278082 => 278083)
--- trunk/Tools/lldb/lldb_webkit_unittest.py 2021-05-26 15:15:22 UTC (rev 278082)
+++ trunk/Tools/lldb/lldb_webkit_unittest.py 2021-05-26 15:23:48 UTC (rev 278083)
@@ -115,11 +115,11 @@
def serial_test_WTFStringImpl_SummaryProvider_8bit_string(self):
summary = lldb_webkit.WTFStringImpl_SummaryProvider(self._sbFrame.FindVariable('an8BitStringImpl'), {})
- self.assertEqual(summary, "{ length = 8, is8bit = 1, contents = 'r\\xe9sum\\xe9' }")
+ self.assertEqual(summary, u"{ length = 8, is8bit = 1, contents = 'r\xe9sum\xe9' }")
def serial_test_WTFStringImpl_SummaryProvider_16bit_string(self):
summary = lldb_webkit.WTFStringImpl_SummaryProvider(self._sbFrame.FindVariable('a16BitStringImpl'), {})
- self.assertEqual(summary, u"{ length = 13, is8bit = 0, contents = '\\u1680Cappuccino\\u1680\\x00' }")
+ self.assertEqual(summary, u"{ length = 13, is8bit = 0, contents = '\u1680Cappuccino\u1680\x00' }")
# MARK: WTFString_SummaryProvider test cases
@@ -133,11 +133,11 @@
def serial_test_WTFString_SummaryProvider_8bit_string(self):
summary = lldb_webkit.WTFString_SummaryProvider(self._sbFrame.FindVariable('an8BitString'), {})
- self.assertEqual(summary, "{ length = 8, contents = 'r\\xe9sum\\xe9' }")
+ self.assertEqual(summary, u"{ length = 8, contents = 'r\xe9sum\xe9' }")
def serial_test_WTFString_SummaryProvider_16bit_string(self):
summary = lldb_webkit.WTFString_SummaryProvider(self._sbFrame.FindVariable('a16BitString'), {})
- self.assertEqual(summary, u"{ length = 13, contents = '\\u1680Cappuccino\\u1680\\x00' }")
+ self.assertEqual(summary, u"{ length = 13, contents = '\u1680Cappuccino\u1680\x00' }")
# MARK: WTFVector_SummaryProvider test cases