Diff
Modified: trunk/Tools/ChangeLog (249150 => 249151)
--- trunk/Tools/ChangeLog 2019-08-27 17:34:58 UTC (rev 249150)
+++ trunk/Tools/ChangeLog 2019-08-27 18:01:31 UTC (rev 249151)
@@ -1,3 +1,17 @@
+2019-08-27 Jonathan Bedard <[email protected]>
+
+ run-webkit-tests: Use -noBulkSymbolication when calling spindump (Follow-up fix)
+ https://bugs.webkit.org/show_bug.cgi?id=201000
+ <rdar://problem/53778938>
+
+ Unreviewed follow-up fix.
+
+ * Scripts/webkitpy/port/darwin.py:
+ (DarwinPort.sample_process): Run spindump without -noBulkSymbolication if previous
+ spindump call failed.
+ * Scripts/webkitpy/port/darwin_testcase.py:
+ * Scripts/webkitpy/port/ios_device_unittest.py:
+
2019-08-27 Aakash Jain <[email protected]>
[ews-build] Use update-webkit script in Apply-WatchList EWS
Modified: trunk/Tools/Scripts/webkitpy/port/darwin.py (249150 => 249151)
--- trunk/Tools/Scripts/webkitpy/port/darwin.py 2019-08-27 17:34:58 UTC (rev 249150)
+++ trunk/Tools/Scripts/webkitpy/port/darwin.py 2019-08-27 18:01:31 UTC (rev 249151)
@@ -181,7 +181,7 @@
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:
+ if 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()))
Modified: trunk/Tools/Scripts/webkitpy/port/darwin_testcase.py (249150 => 249151)
--- trunk/Tools/Scripts/webkitpy/port/darwin_testcase.py 2019-08-27 17:34:58 UTC (rev 249150)
+++ trunk/Tools/Scripts/webkitpy/port/darwin_testcase.py 2019-08-27 18:01:31 UTC (rev 249151)
@@ -109,7 +109,6 @@
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']
['/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')
Modified: trunk/Tools/Scripts/webkitpy/port/ios_device_unittest.py (249150 => 249151)
--- trunk/Tools/Scripts/webkitpy/port/ios_device_unittest.py 2019-08-27 17:34:58 UTC (rev 249150)
+++ trunk/Tools/Scripts/webkitpy/port/ios_device_unittest.py 2019-08-27 18:01:31 UTC (rev 249151)
@@ -56,7 +56,6 @@
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']
['/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')
