Changeset 57622 in webkit

Timestamp:

Apr 14, 2010 5:59:11 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

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

Reviewed by Adam Barth.

Add some very minimal unit tests for new-run-webkit-tests. This should
be enough to catch egregious brokenness like syntax errors and import
declaration issues.

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

• Scripts/webkitpy/layout_tests/run_webkit_tests.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py: Added.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (6 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py (added)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-15  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Add some very minimal unit tests for new-run-webkit-tests. This should
+        be enough to catch egregious brokenness like syntax errors and import
+        declaration issues.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37432
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py: Added.
+
 2010-04-14  Brian Weinstein  <bweinstein@apple.com>
 

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

@@ -605 +605 @@
         return self._contains_tests(self.HTTP_SUBDIR)
 
-    def run(self, result_summary):
+    def run(self, result_summary, print_results):
         """Run all our tests on all our test files.
 
@@ -613 +613 @@
         Args:
           result_summary: a summary object tracking the test results.
+          print_results: whether or not to print the summary at the end
 
         Return:
@@ -668 +669 @@
         sys.stderr.flush()
 
-        if (LOG_DETAILED_PROGRESS in self._options.log or
-            (LOG_UNEXPECTED in self._options.log and
-             result_summary.total != result_summary.expected)):
-            print
-
         # This summary data gets written to stdout regardless of log level
-        self._print_one_line_summary(result_summary.total,
-                                  result_summary.expected)
+        # (unless of course we're printing nothing).
+        if print_results:
+            if (LOG_DETAILED_PROGRESS in self._options.log or
+                (LOG_UNEXPECTED in self._options.log and
+                 result_summary.total != result_summary.expected)):
+                print
+            self._print_one_line_summary(result_summary.total,
+                                         result_summary.expected)
 
         unexpected_results = self._summarize_unexpected_results(result_summary,
@@ -1368 +1370 @@
 
 
-def main(options, args):
+def main(options, args, print_results=True):
     """Run the tests.
 
@@ -1374 +1376 @@
       options: a dictionary of command line options
       args: a list of sub directories or files to test
+      print_results: whether or not to log anything to stdout.
+          Set to false by the unit tests
     Returns:
       the number of unexpected results that occurred, or -1 if there is an
@@ -1517 +1521 @@
             test_runner.add_test_type(fuzzy_image_diff.FuzzyImageDiff)
 
-    num_unexpected_results = test_runner.run(result_summary)
+    num_unexpected_results = test_runner.run(result_summary, print_results)
 
     port_obj.stop_helper()