Changeset 92803 in webkit

Timestamp:

Aug 10, 2011, 5:00:39 PM (14 years ago)

Author:

eric@webkit.org

Message:

new-run-webkit-test's WinPort has no fallback logic
​https://bugs.webkit.org/show_bug.cgi?id=64486

Unreviewed.

Turns out that we've long had a subtle bug whereby if you didn't
already have DumpRenderTree built, we might end up running unsupported tests
because the DumpRenderTree --print-supported-features check would silently fail.

When I moved the call from using popen to using Executive.run_command, this silent
failure became noisy. (Breaking some bots.)

This re-orders our steps so that we always build DRT before collecting expectations,
as well as adds a warning message when DumpRenderTree can't be found.

• Scripts/webkitpy/layout_tests/port/webkit.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-10  Eric Seidel  <eric@webkit.org>
+
+        new-run-webkit-test's WinPort has no fallback logic
+        https://bugs.webkit.org/show_bug.cgi?id=64486
+
+        Unreviewed.
+
+        Turns out that we've long had a subtle bug whereby if you didn't
+        already have DumpRenderTree built, we might end up running unsupported tests
+        because the DumpRenderTree --print-supported-features check would silently fail.
+
+        When I moved the call from using popen to using Executive.run_command, this silent
+        failure became noisy.  (Breaking some bots.)
+
+        This re-orders our steps so that we always build DRT before collecting expectations,
+        as well as adds a warning message when DumpRenderTree can't be found.
+
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2011-08-10  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py

@@ -230 +230 @@
         this DRT switch, it has to override this method to return None"""
         supported_features_command = [self._path_to_driver(), '--print-supported-features']
-        output = self._executive.run_command(supported_features_command, error_handler=Executive.ignore_error)
+        try:
+            output = self._executive.run_command(supported_features_command, error_handler=Executive.ignore_error)
+        except OSError, e:
+            _log.warn("Exception runnig driver: %s, %s.  Driver must be built before calling WebKitPort.test_expectations()." % (supported_features_command, e))
+            return []
+
         # Note: win/DumpRenderTree.cpp does not print a leading space before the features_string.
         match_object = re.match("SupportedFeatures:\s*(?P<features_string>.*)\s*", output)

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -95 +95 @@
             return manager.lint()
 
-        printer.print_update("Parsing expectations ...")
-        manager.parse_expectations()
-
         printer.print_update("Checking build ...")
         if not port.check_build(manager.needs_servers()):
             _log.error("Build check failed")
             return -1
+
+        printer.print_update("Parsing expectations ...")
+        manager.parse_expectations()
 
         result_summary = manager.set_up_run()