Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(601)

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

Issue 2821543003: In run-webkit-tests, start xvfb if necessary. (Closed)
Patch Set: Check process after starting, wait after killing, change stderr redirect to DEVNULL Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
index 6a792fcadb8a06fd9119c6fe3cd0febfc96109df..6b261b5a5e51a8c91e962814f1baebf36531d304 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
@@ -325,6 +325,8 @@ class Manager(object):
self._delete_dirs(results_directories[:-self.ARCHIVED_RESULTS_LIMIT])
def _set_up_run(self, test_names):
+ exit_code = self._port.setup_test_run()
+
self._printer.write_update("Checking build ...")
if self._options.build:
exit_code = self._port.check_build(self._needs_servers(test_names), self._printer)
@@ -332,13 +334,6 @@ class Manager(object):
_log.error("Build check failed")
return exit_code
- # Check that the system dependencies (themes, fonts, ...) are correct.
- if not self._options.nocheck_sys_deps:
- self._printer.write_update("Checking system dependencies ...")
- exit_code = self._port.check_sys_deps(self._needs_servers(test_names))
- if exit_code:
- return exit_code
-
if self._options.clobber_old_results:
self._clobber_old_results()
elif self._filesystem.exists(self._results_directory):
@@ -349,7 +344,13 @@ class Manager(object):
# 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()
+ # Check that the system dependencies (themes, fonts, ...) are correct.
+ if not self._options.nocheck_sys_deps:
+ self._printer.write_update("Checking system dependencies ...")
+ exit_code = self._port.check_sys_deps(self._needs_servers(test_names))
+ if exit_code:
+ return exit_code
+
return exit_codes.OK_EXIT_STATUS
def _run_tests(self, tests_to_run, tests_to_skip, repeat_each, iterations,

Powered by Google App Engine
This is Rietveld 408576698