Changeset 57486 in webkit

Timestamp:

Apr 12, 2010 4:15:08 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

2010-04-12 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Eric Seidel.

Modify run_webkit_tests.py to not call sys.exit() at the end of test
run; doing so makes it more difficult to embed the routine for,
among other things, unit tests. We push the exit calling up into
new-run-webkit-tests.

​https://bugs.webkit.org/show_bug.cgi?id=37464

• Scripts/new-run-webkit-tests:
• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/new-run-webkit-tests (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (7 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-12  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Modify run_webkit_tests.py to not call sys.exit() at the end of test
+        run; doing so makes it more difficult to embed the routine for,
+        among other things, unit tests. We push the exit calling up into
+        new-run-webkit-tests.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37464
+
+        * Scripts/new-run-webkit-tests:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2010-04-12  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/new-run-webkit-tests

@@ -29 +29 @@
 
 """Wrapper around webkitpy/layout_tests/run_webkit_tests.py"""
+import sys
 
 import webkitpy.layout_tests.run_webkit_tests as run_webkit_tests
@@ -34 +35 @@
 if __name__ == '__main__':
     options, args = run_webkit_tests.parse_args()
-    run_webkit_tests.main(options, args)
+    sys.exit(run_webkit_tests.main(options, args))

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

@@ -615 +615 @@
 
         Return:
-          We return nonzero if there are regressions compared to the last run.
+          The number of unexpected results (0 == success)
         """
         if not self._test_files:
@@ -1369 +1369 @@
 
 def main(options, args):
-    """Run the tests.  Will call sys.exit when complete.
+    """Run the tests.
 
     Args:
       options: a dictionary of command line options
       args: a list of sub directories or files to test
+    Returns:
+      the number of unexpected results that occurred, or -1 if there is an
+          error.
     """
 
@@ -1471 +1474 @@
         print ("If there are no fail messages, errors or exceptions, then the "
             "lint succeeded.")
-        sys.exit(0)
+        return 0
 
     write = create_logging_writer(options, "config")
@@ -1491 +1494 @@
     meter.update("Checking build ...")
     if not port_obj.check_build(test_runner.needs_http()):
-        sys.exit(1)
+        return -1
 
     meter.update("Starting helper ...")
@@ -1500 +1503 @@
         meter.update("Checking system dependencies ...")
         if not port_obj.check_sys_deps(test_runner.needs_http()):
-            sys.exit(1)
+            return -1
 
     meter.update("Preparing tests ...")
@@ -1514 +1517 @@
             test_runner.add_test_type(fuzzy_image_diff.FuzzyImageDiff)
 
-    has_new_failures = test_runner.run(result_summary)
+    num_unexpected_results = test_runner.run(result_summary)
 
     port_obj.stop_helper()
 
-    _log.debug("Exit status: %d" % has_new_failures)
-    sys.exit(has_new_failures)
+    _log.debug("Exit status: %d" % num_unexpected_results)
+    return num_unexpected_results
 
 
@@ -1621 +1624 @@
 if '__main__' == __name__:
     options, args = parse_args()
-    main(options, args)
+    sys.exit(main(options, args))