Diff
Modified: trunk/Tools/ChangeLog (249022 => 249023)
--- trunk/Tools/ChangeLog 2019-08-22 18:54:34 UTC (rev 249022)
+++ trunk/Tools/ChangeLog 2019-08-22 19:04:52 UTC (rev 249023)
@@ -1,3 +1,19 @@
+2019-08-22 Jonathan Bedard <[email protected]>
+
+ run-webkit-tests: Use -noBulkSymbolication when calling spindump
+ https://bugs.webkit.org/show_bug.cgi?id=201000
+ <rdar://problem/53778938>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/webkitpy/port/darwin.py:
+ (DarwinPort.sample_process): Attempt to symbolicate with -noBulkSymbolication first.
+ * Scripts/webkitpy/port/darwin_testcase.py:
+ (DarwinTest.test_tailspin):
+ (DarwinTest.test_get_crash_log): Deleted.
+ * Scripts/webkitpy/port/ios_device_unittest.py:
+ (IOSDeviceTest.test_tailspin):
+
2019-08-22 Zhifei Fang <[email protected]>
[results.webkit.org Webkit.css] Change input's disable style
Modified: trunk/Tools/Scripts/webkitpy/port/darwin.py (249022 => 249023)
--- trunk/Tools/Scripts/webkitpy/port/darwin.py 2019-08-22 18:54:34 UTC (rev 249022)
+++ trunk/Tools/Scripts/webkitpy/port/darwin.py 2019-08-22 19:04:52 UTC (rev 249023)
@@ -172,14 +172,17 @@
exit_status = host.executive.run_command(command, return_exit_code=True)
if not exit_status: # Symbolicate tailspin log using spindump
+ spindump_command = [
+ '/usr/sbin/spindump',
+ '-i', temp_tailspin_file_path,
+ '-file', DarwinPort.tailspin_file_path(host, name, pid, str(tempdir)),
+ ]
try:
- host.executive.run_command([
- '/usr/sbin/spindump',
- '-i',
- temp_tailspin_file_path,
- '-file',
- DarwinPort.tailspin_file_path(host, name, pid, str(tempdir)),
- ])
+ exit_code = host.executive.run_command(spindump_command + ['-noBulkSymbolication'], return_exit_code=True)
+
+ # FIXME: Remove the fallback when we no longer support Catalina.
+ if not exit_code:
+ host.executive.run_command(spindump_command)
host.filesystem.move_to_base_host(DarwinPort.tailspin_file_path(host, name, pid, str(tempdir)),
DarwinPort.tailspin_file_path(self.host, name, pid, self.results_directory()))
except IOError as e:
Modified: trunk/Tools/Scripts/webkitpy/port/darwin_testcase.py (249022 => 249023)
--- trunk/Tools/Scripts/webkitpy/port/darwin_testcase.py 2019-08-22 18:54:34 UTC (rev 249022)
+++ trunk/Tools/Scripts/webkitpy/port/darwin_testcase.py 2019-08-22 19:04:52 UTC (rev 249023)
@@ -107,7 +107,10 @@
port.host.filesystem.files['/__im_tmp/tmp_0_/test-42-tailspin-temp.txt'] = 'Temporary tailspin output file'
port.host.filesystem.files['/__im_tmp/tmp_0_/test-42-tailspin.txt'] = 'Symbolocated tailspin file'
port.host.executive = MockExecutive2(run_command_fn=logging_run_command)
- expected_stdout = "['/usr/bin/sudo', '-n', '/usr/bin/tailspin', 'save', '-n', '/__im_tmp/tmp_0_/test-42-tailspin-temp.txt']\n['/usr/sbin/spindump', '-i', '/__im_tmp/tmp_0_/test-42-tailspin-temp.txt', '-file', '/__im_tmp/tmp_0_/test-42-tailspin.txt']\n"
+ expected_stdout = """['/usr/bin/sudo', '-n', '/usr/bin/tailspin', 'save', '-n', '/__im_tmp/tmp_0_/test-42-tailspin-temp.txt']
+['/usr/sbin/spindump', '-i', '/__im_tmp/tmp_0_/test-42-tailspin-temp.txt', '-file', '/__im_tmp/tmp_0_/test-42-tailspin.txt', '-noBulkSymbolication']
+['/usr/sbin/spindump', '-i', '/__im_tmp/tmp_0_/test-42-tailspin-temp.txt', '-file', '/__im_tmp/tmp_0_/test-42-tailspin.txt']
+"""
OutputCapture().assert_outputs(self, port.sample_process, args=['test', 42], expected_stdout=expected_stdout)
self.assertEqual(port.host.filesystem.files['/mock-build/layout-test-results/test-42-tailspin.txt'], 'Symbolocated tailspin file')
self.assertIsNone(port.host.filesystem.files['/__im_tmp/tmp_0_/test-42-tailspin-temp.txt'])
Modified: trunk/Tools/Scripts/webkitpy/port/ios_device_unittest.py (249022 => 249023)
--- trunk/Tools/Scripts/webkitpy/port/ios_device_unittest.py 2019-08-22 18:54:34 UTC (rev 249022)
+++ trunk/Tools/Scripts/webkitpy/port/ios_device_unittest.py 2019-08-22 19:04:52 UTC (rev 249023)
@@ -54,7 +54,10 @@
port.host.filesystem.files['/__im_tmp/tmp_0_/test-42-tailspin-temp.txt'] = 'Temporary tailspin output file'
port.host.filesystem.files['/__im_tmp/tmp_0_/test-42-tailspin.txt'] = 'Symbolocated tailspin file'
port.host.executive = MockExecutive2(run_command_fn=logging_run_command)
- expected_stdout = "['/usr/bin/tailspin', 'save', '-n', '/__im_tmp/tmp_0_/test-42-tailspin-temp.txt']\n['/usr/sbin/spindump', '-i', '/__im_tmp/tmp_0_/test-42-tailspin-temp.txt', '-file', '/__im_tmp/tmp_0_/test-42-tailspin.txt']\n"
+ expected_stdout = """['/usr/bin/tailspin', 'save', '-n', '/__im_tmp/tmp_0_/test-42-tailspin-temp.txt']
+['/usr/sbin/spindump', '-i', '/__im_tmp/tmp_0_/test-42-tailspin-temp.txt', '-file', '/__im_tmp/tmp_0_/test-42-tailspin.txt', '-noBulkSymbolication']
+['/usr/sbin/spindump', '-i', '/__im_tmp/tmp_0_/test-42-tailspin-temp.txt', '-file', '/__im_tmp/tmp_0_/test-42-tailspin.txt']
+"""
OutputCapture().assert_outputs(self, port.sample_process, args=['test', 42], expected_stdout=expected_stdout)
self.assertEqual(port.host.filesystem.files['/mock-build/layout-test-results/test-42-tailspin.txt'], 'Symbolocated tailspin file')
self.assertIsNone(port.host.filesystem.files['/__im_tmp/tmp_0_/test-42-tailspin-temp.txt'])
