Merge webkit.org at r60469 : Initial merge by git.

Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234

3 files changed, 33 insertions, 12 deletions

diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
index 09f9ac7..a2e2091 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
@@ -258,6 +258,9 @@ class TestShellThread(threading.Thread):
             self._run(test_runner=None, result_summary=None)
             _log.debug('%s done (%d tests)' % (self.getName(),
                        self.get_num_tests()))
+        except KeyboardInterrupt:
+            self._exception_info = sys.exc_info()
+            _log.debug("%s interrupted" % self.getName())
         except:
             # Save the exception for our caller to see.
             self._exception_info = sys.exc_info()
@@ -298,7 +301,7 @@ class TestShellThread(threading.Thread):
 
         while True:
             if self._canceled:
-                _log.info('Testing canceled')
+                _log.debug('Testing cancelled')
                 tests_run_file.close()
                 return
 
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing.py
index 77de2e0..f838a7b 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing.py
@@ -272,24 +272,35 @@ class Printer(object):
     def print_timing(self, msg):
         self.write(msg, 'timing')
 
-    def print_one_line_summary(self, total, expected):
+    def print_one_line_summary(self, total, expected, unexpected):
         """Print a one-line summary of the test run to stdout.
 
         Args:
           total: total number of tests run
           expected: number of expected results
+          unexpected: number of unexpected results
         """
         if self.disabled('one-line-summary'):
             return
 
-        unexpected = total - expected
+        incomplete = total - expected - unexpected
+        if incomplete:
+            self._write("")
+            incomplete_str = " (%d didn't run)" % incomplete
+            expected_str = str(expected)
+        else:
+            incomplete_str = ""
+            expected_str = "All %d" % expected
+
         if unexpected == 0:
-            self._write("All %d tests ran as expected." % expected)
+            self._write("%s tests ran as expected%s." %
+                        (expected_str, incomplete_str))
         elif expected == 1:
-            self._write("1 test ran as expected, %d didn't:" % unexpected)
+            self._write("1 test ran as expected, %d didn't%s:" %
+                        (unexpected, incomplete_str))
         else:
-            self._write("%d tests ran as expected, %d didn't:" %
-                        (expected, unexpected))
+            self._write("%d tests ran as expected, %d didn't%s:" %
+                        (expected, unexpected, incomplete_str))
         self._write("")
 
     def print_test_result(self, result, expected, exp_str, got_str):
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py
index 3804210..c8648bc 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py
@@ -215,27 +215,34 @@ class  Testprinter(unittest.TestCase):
 
     def test_print_one_line_summary(self):
         printer, err, out = self.get_printer(['--print', 'nothing'])
-        printer.print_one_line_summary(1, 1)
+        printer.print_one_line_summary(1, 1, 0)
         self.assertTrue(err.empty())
 
         printer, err, out = self.get_printer(['--print', 'one-line-summary'])
-        printer.print_one_line_summary(1, 1)
+        printer.print_one_line_summary(1, 1, 0)
         self.assertEquals(err.get(), ["All 1 tests ran as expected.\n", "\n"])
 
         printer, err, out = self.get_printer(['--print', 'everything'])
-        printer.print_one_line_summary(1, 1)
+        printer.print_one_line_summary(1, 1, 0)
         self.assertEquals(err.get(), ["All 1 tests ran as expected.\n", "\n"])
 
         err.reset()
-        printer.print_one_line_summary(2, 1)
+        printer.print_one_line_summary(2, 1, 1)
         self.assertEquals(err.get(),
                           ["1 test ran as expected, 1 didn't:\n", "\n"])
 
         err.reset()
-        printer.print_one_line_summary(3, 2)
+        printer.print_one_line_summary(3, 2, 1)
         self.assertEquals(err.get(),
                           ["2 tests ran as expected, 1 didn't:\n", "\n"])
 
+        err.reset()
+        printer.print_one_line_summary(3, 2, 0)
+        self.assertEquals(err.get(),
+                          ['\n', "2 tests ran as expected (1 didn't run).\n",
+                           '\n'])
+
+
     def test_print_test_result(self):
         result = get_result('foo.html')
         printer, err, out = self.get_printer(['--print', 'nothing'])