Title: [236151] trunk/Tools
- Revision
- 236151
- Author
- [email protected]
- Date
- 2018-09-18 13:10:33 -0700 (Tue, 18 Sep 2018)
Log Message
webkitpy: Clobbering and building occurs multiple times for iOS Simulator ports
https://bugs.webkit.org/show_bug.cgi?id=189702
<rdar://problem/44541704>
Reviewed by Aakash Jain.
* Scripts/webkitpy/layout_tests/controllers/manager.py:
(Manager._set_up_run): Move build check and clobbering to run, since set up is
run multiple times for iOS simulator.
(Manager.run):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (236150 => 236151)
--- trunk/Tools/ChangeLog 2018-09-18 18:45:58 UTC (rev 236150)
+++ trunk/Tools/ChangeLog 2018-09-18 20:10:33 UTC (rev 236151)
@@ -1,3 +1,16 @@
+2018-09-18 Jonathan Bedard <[email protected]>
+
+ webkitpy: Clobbering and building occurs multiple times for iOS Simulator ports
+ https://bugs.webkit.org/show_bug.cgi?id=189702
+ <rdar://problem/44541704>
+
+ Reviewed by Aakash Jain.
+
+ * Scripts/webkitpy/layout_tests/controllers/manager.py:
+ (Manager._set_up_run): Move build check and clobbering to run, since set up is
+ run multiple times for iOS simulator.
+ (Manager.run):
+
2018-09-18 Chris Dumez <[email protected]>
"DidFirstVisuallyNonEmptyLayout" callback does not get called when restoring a page from PageCache
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (236150 => 236151)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2018-09-18 18:45:58 UTC (rev 236150)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2018-09-18 20:10:33 UTC (rev 236151)
@@ -160,11 +160,6 @@
self._options.child_processes = worker_count
def _set_up_run(self, test_names, device_class=None):
- self._printer.write_update("Checking build ...")
- if not self._port.check_build():
- _log.error("Build check failed")
- return False
-
self._options.device_class = device_class
# This must be started before we check the system dependencies,
@@ -183,12 +178,6 @@
self._port.stop_helper()
return False
- if self._options.clobber_old_results:
- self._clobber_old_results()
-
- # Create the output directory if it doesn't already exist.
- self._port.host.filesystem.maybe_make_directory(self._results_directory)
-
self._port.setup_test_run(self._options.device_class)
return True
@@ -239,6 +228,17 @@
self._runner = LayoutTestRunner(self._options, self._port, self._printer, self._results_directory, self._test_is_slow,
needs_http=needs_http, needs_web_platform_test_server=needs_web_platform_test_server, needs_websockets=needs_websockets)
+ self._printer.write_update("Checking build ...")
+ if not self._port.check_build():
+ _log.error("Build check failed")
+ return test_run_results.RunDetails(exit_code=-1)
+
+ if self._options.clobber_old_results:
+ self._clobber_old_results()
+
+ # Create the output directory if it doesn't already exist.
+ self._port.host.filesystem.maybe_make_directory(self._results_directory)
+
if default_device_tests:
_log.info('')
_log.info("Running %s", pluralize(len(tests_to_run), "test"))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
