Fix minor bug - start layout_test_helper before checking sys deps

Starting layout_test_helper first gives us a chance to put the system into
the right config before running; not doing so makes it kind of pointless.

   BUG=none
   R=tc@chromium.org
   TEST=none

Review URL: http://codereview.chromium.org/164014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22563 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 14 deletions

diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index 89af345..056af73 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -500,20 +500,6 @@ class TestRunner:
     start_time = time.time()
     test_shell_binary = path_utils.TestShellBinaryPath(self._options.target)
 
-    # Check that the system dependencies (themes, fonts, ...) are correct.
-    if not self._options.nocheck_sys_deps:
-      proc = subprocess.Popen([test_shell_binary,
-                              "--check-layout-test-sys-deps"])
-      if proc.wait() != 0:
-        logging.info("Aborting because system dependencies check failed.\n"
-                     "To override, invoke with --nocheck-sys-deps")
-        sys.exit(1)
-
-    logging.info("Starting tests")
-
-    # Create the output directory if it doesn't already exist.
-    google.path_utils.MaybeMakeDirectory(self._options.results_directory)
-
     # Start up any helper needed
     layout_test_helper_proc = None
     if not options.no_pixel_tests:
@@ -528,6 +514,20 @@ class TestRunner:
         if not is_ready.startswith('ready'):
           logging.error("layout_test_helper failed to be ready")
 
+    # Check that the system dependencies (themes, fonts, ...) are correct.
+    if not self._options.nocheck_sys_deps:
+      proc = subprocess.Popen([test_shell_binary,
+                              "--check-layout-test-sys-deps"])
+      if proc.wait() != 0:
+        logging.info("Aborting because system dependencies check failed.\n"
+                     "To override, invoke with --nocheck-sys-deps")
+        sys.exit(1)
+
+    logging.info("Starting tests")
+
+    # Create the output directory if it doesn't already exist.
+    google.path_utils.MaybeMakeDirectory(self._options.results_directory)
+
     threads = self._InstantiateTestShellThreads(test_shell_binary)
 
     # Wait for the threads to finish and collect test failures.