[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit c6902a43200b00beb3bd5f8e1f2334330be209a3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 8 23:52:21 2010 +0000

    2010-01-08  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            run-javascriptcore-tests needs a --quiet flag
            https://bugs.webkit.org/show_bug.cgi?id=33399
    
            Until run-javascriptcore-tests has a --quiet flag, lets just stiffle the output in webkit-patch.
    
            * Scripts/webkitpy/steps/runtests.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53018 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3f83c73..2b660aa 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-08  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        run-javascriptcore-tests needs a --quiet flag
+        https://bugs.webkit.org/show_bug.cgi?id=33399
+
+        Until run-javascriptcore-tests has a --quiet flag, lets just stiffle the output in webkit-patch.
+
+        * Scripts/webkitpy/steps/runtests.py:
+
 2010-01-08  Andras Becsi  <abecsi at inf.u-szeged.hu>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/WebKitTools/Scripts/webkitpy/commands/download_unittest.py b/WebKitTools/Scripts/webkitpy/commands/download_unittest.py
index f2c7d9c..81b9da5 100644
--- a/WebKitTools/Scripts/webkitpy/commands/download_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/commands/download_unittest.py
@@ -52,7 +52,7 @@ class DownloadCommandsTest(CommandsTest):
         self.assert_execute_outputs(Build(), [], options=self._default_options(), expected_stderr=expected_stderr)
 
     def test_build_and_test(self):
-        expected_stderr = "Updating working directory\nBuilding WebKit\n"
+        expected_stderr = "Updating working directory\nBuilding WebKit\nRunning Python unit tests\nRunning Perl unit tests\nRunning JavaScriptCore tests\nRunning run-webkit-tests\n"
         self.assert_execute_outputs(BuildAndTest(), [], options=self._default_options(), expected_stderr=expected_stderr)
 
     def test_apply_attachment(self):
@@ -70,7 +70,7 @@ class DownloadCommandsTest(CommandsTest):
         self.assert_execute_outputs(ApplyFromBug(), [42], options=options, expected_stderr=expected_stderr)
 
     def test_land_diff(self):
-        expected_stderr = "Building WebKit\nUpdating bug 42\n"
+        expected_stderr = "Building WebKit\nRunning Python unit tests\nRunning Perl unit tests\nRunning JavaScriptCore tests\nRunning run-webkit-tests\nUpdating bug 42\n"
         self.assert_execute_outputs(Land(), [42], options=self._default_options(), expected_stderr=expected_stderr)
 
     def test_check_style(self):
@@ -82,11 +82,27 @@ class DownloadCommandsTest(CommandsTest):
         self.assert_execute_outputs(BuildAttachment(), [197], options=self._default_options(), expected_stderr=expected_stderr)
 
     def test_land_attachment(self):
-        expected_stderr = "Processing 1 patch from 1 bug.\nUpdating working directory\nProcessing patch 197 from bug 42.\nBuilding WebKit\n"
+        expected_stderr = "Processing 1 patch from 1 bug.\nUpdating working directory\nProcessing patch 197 from bug 42.\nBuilding WebKit\nRunning Python unit tests\nRunning Perl unit tests\nRunning JavaScriptCore tests\nRunning run-webkit-tests\n"
         self.assert_execute_outputs(LandAttachment(), [197], options=self._default_options(), expected_stderr=expected_stderr)
 
     def test_land_patches(self):
-        expected_stderr = "2 reviewed patches found on bug 42.\nProcessing 2 patches from 1 bug.\nUpdating working directory\nProcessing patch 197 from bug 42.\nBuilding WebKit\nUpdating working directory\nProcessing patch 128 from bug 42.\nBuilding WebKit\n"
+        expected_stderr = """2 reviewed patches found on bug 42.
+Processing 2 patches from 1 bug.
+Updating working directory
+Processing patch 197 from bug 42.
+Building WebKit
+Running Python unit tests
+Running Perl unit tests
+Running JavaScriptCore tests
+Running run-webkit-tests
+Updating working directory
+Processing patch 128 from bug 42.
+Building WebKit
+Running Python unit tests
+Running Perl unit tests
+Running JavaScriptCore tests
+Running run-webkit-tests
+"""
         self.assert_execute_outputs(LandFromBug(), [42], options=self._default_options(), expected_stderr=expected_stderr)
 
     def test_rollout(self):
diff --git a/WebKitTools/Scripts/webkitpy/steps/runtests.py b/WebKitTools/Scripts/webkitpy/steps/runtests.py
index 4c16793..ebe809f 100644
--- a/WebKitTools/Scripts/webkitpy/steps/runtests.py
+++ b/WebKitTools/Scripts/webkitpy/steps/runtests.py
@@ -28,6 +28,7 @@
 
 from webkitpy.steps.abstractstep import AbstractStep
 from webkitpy.steps.options import Options
+from webkitpy.webkit_logging import log
 
 class RunTests(AbstractStep):
     @classmethod
@@ -47,10 +48,14 @@ class RunTests(AbstractStep):
             return
 
         # Run the scripting unit tests first because they're quickest.
+        log("Running Python unit tests")
         self._tool.executive.run_and_throw_if_fail(self.port().run_python_unittests_command())
+        log("Running Perl unit tests")
         self._tool.executive.run_and_throw_if_fail(self.port().run_perl_unittests_command())
-        self._tool.executive.run_and_throw_if_fail(self.port().run_javascriptcore_tests_command())
+        log("Running JavaScriptCore tests")
+        self._tool.executive.run_and_throw_if_fail(self.port().run_javascriptcore_tests_command(), quiet=True)
 
+        log("Running run-webkit-tests")
         args = self.port().run_webkit_tests_command()
         if self._options.non_interactive:
             args.append("--no-launch-safari")

-- 
WebKit Debian packaging