Title: [215380] trunk/Tools
- Revision
- 215380
- Author
- ryanhad...@apple.com
- Date
- 2017-04-14 16:26:52 -0700 (Fri, 14 Apr 2017)
Log Message
Unreviewed, rolling out r215374.
This change causes LayoutTests to exit early with crashes on
Sierra.
Reverted changeset:
"webkitpy: Ignore previously launched pid when system is under
stress"
https://bugs.webkit.org/show_bug.cgi?id=170741
http://trac.webkit.org/changeset/215374
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (215379 => 215380)
--- trunk/Tools/ChangeLog 2017-04-14 23:20:19 UTC (rev 215379)
+++ trunk/Tools/ChangeLog 2017-04-14 23:26:52 UTC (rev 215380)
@@ -1,3 +1,17 @@
+2017-04-14 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r215374.
+
+ This change causes LayoutTests to exit early with crashes on
+ Sierra.
+
+ Reverted changeset:
+
+ "webkitpy: Ignore previously launched pid when system is under
+ stress"
+ https://bugs.webkit.org/show_bug.cgi?id=170741
+ http://trac.webkit.org/changeset/215374
+
2017-04-14 Dan Bernstein <m...@apple.com>
[ios-simulator] API test WebKit2.AdditionalReadAccessAllowedURLs is failing
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py (215379 => 215380)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py 2017-04-14 23:20:19 UTC (rev 215379)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py 2017-04-14 23:26:52 UTC (rev 215380)
@@ -314,9 +314,11 @@
def _kill_driver(self):
# Be careful about how and when we kill the driver; if driver.stop()
# raises an exception, this routine may get re-entered via __del__.
- if self._driver:
+ driver = self._driver
+ self._driver = None
+ if driver:
_log.debug("%s killing driver" % self._name)
- self._driver.stop()
+ driver.stop()
def _run_test_with_or_without_timeout(self, test_input, timeout, stop_when_done):
if self._options.run_singly:
Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (215379 => 215380)
--- trunk/Tools/Scripts/webkitpy/port/driver.py 2017-04-14 23:20:19 UTC (rev 215379)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2017-04-14 23:26:52 UTC (rev 215380)
@@ -394,12 +394,6 @@
self._target_host.filesystem.rmtree(self._driver_user_cache_directory)
self._driver_user_cache_directory = None
- self._crashed_process_name = None
- self._crashed_pid = None
- self._driver_timed_out = False
- self.error_from_test = str()
- self.err_seen_eof = False
-
def cmd_line(self, pixel_tests, per_test_args):
cmd = self._command_wrapper()
cmd.append(self._port._path_to_driver())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
