Diff
Modified: trunk/Tools/ChangeLog (104637 => 104638)
--- trunk/Tools/ChangeLog 2012-01-10 23:33:59 UTC (rev 104637)
+++ trunk/Tools/ChangeLog 2012-01-10 23:35:33 UTC (rev 104638)
@@ -1,3 +1,25 @@
+2012-01-10 James Robinson <[email protected]>
+
+ [chromium] Run webkit_unit_tests as part of webkit-patch build-and-test
+ https://bugs.webkit.org/show_bug.cgi?id=75988
+
+ Reviewed by Adam Barth.
+
+ * Scripts/webkitpy/common/config/ports.py:
+ (WebKitPort.run_webkit_unit_tests_command):
+ (WebKitPort):
+ (ChromiumPort.run_webkit_unit_tests_command):
+ (ChromiumPort):
+ * Scripts/webkitpy/common/config/ports_mock.py:
+ (MockPort.run_webkit_unit_tests_command):
+ * Scripts/webkitpy/tool/commands/download_unittest.py:
+ (DownloadCommandsTest.test_build_and_test):
+ (test_land):
+ (test_land_red_builders):
+ * Scripts/webkitpy/tool/steps/runtests.py:
+ (RunTests.run):
+ * Scripts/webkitpy/tool/steps/runtests_unittest.py:
+
2012-01-09 Dirk Pranke <[email protected]>
webkitpy: add os_name, os_version to platforminfo
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (104637 => 104638)
--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2012-01-10 23:33:59 UTC (rev 104637)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2012-01-10 23:35:33 UTC (rev 104638)
@@ -105,6 +105,10 @@
return cls.script_shell_command("run-_javascript_core-tests")
@classmethod
+ def run_webkit_unit_tests_command(cls):
+ return None
+
+ @classmethod
def run_webkit_tests_command(cls):
return cls.script_shell_command("run-webkit-tests")
@@ -240,6 +244,10 @@
return command
@classmethod
+ def run_webkit_unit_tests_command(cls):
+ return cls.script_shell_command("run-chromium-webkit-unit-tests")
+
+ @classmethod
def run_webkit_tests_command(cls):
command = cls.script_shell_command("new-run-webkit-tests")
command.append("--chromium")
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports_mock.py (104637 => 104638)
--- trunk/Tools/Scripts/webkitpy/common/config/ports_mock.py 2012-01-10 23:33:59 UTC (rev 104637)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports_mock.py 2012-01-10 23:35:33 UTC (rev 104638)
@@ -55,5 +55,8 @@
def run_javascriptcore_tests_command(self):
return ['mock-run-javacriptcore-tests']
+ def run_webkit_unit_tests_command(self):
+ return ['mock-run-webkit-unit-tests']
+
def run_webkit_tests_command(self):
return ['mock-run-webkit-tests']
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py (104637 => 104638)
--- trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py 2012-01-10 23:33:59 UTC (rev 104637)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py 2012-01-10 23:35:33 UTC (rev 104638)
@@ -90,7 +90,7 @@
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\nRunning Python unit tests\nRunning Perl unit tests\nRunning _javascript_Core tests\nRunning run-webkit-tests\n"
+ expected_stderr = "Updating working directory\nBuilding WebKit\nRunning Python unit tests\nRunning Perl unit tests\nRunning _javascript_Core tests\nRunning WebKit unit tests\nRunning run-webkit-tests\n"
self.assert_execute_outputs(BuildAndTest(), [], options=self._default_options(), expected_stderr=expected_stderr)
def test_apply_attachment(self):
@@ -116,7 +116,7 @@
self.assert_execute_outputs(ApplyWatchList(), [10000], options=self._default_options(), expected_stderr=expected_stderr, tool=MockTool(log_executive=True))
def test_land(self):
- expected_stderr = "Building WebKit\nRunning Python unit tests\nRunning Perl unit tests\nRunning _javascript_Core tests\nRunning run-webkit-tests\nCommitted r49824: <http://trac.webkit.org/changeset/49824>\nUpdating bug 50000\n"
+ expected_stderr = "Building WebKit\nRunning Python unit tests\nRunning Perl unit tests\nRunning _javascript_Core tests\nRunning WebKit unit tests\nRunning run-webkit-tests\nCommitted r49824: <http://trac.webkit.org/changeset/49824>\nUpdating bug 50000\n"
mock_tool = MockTool()
mock_tool.scm().create_patch = Mock(return_value="Patch1\nMockPatch\n")
mock_tool.checkout().modified_changelogs = Mock(return_value=[])
@@ -139,6 +139,8 @@
MOCK run_and_throw_if_fail: ['mock-test-webkitperl'], cwd=/mock-checkout
Running _javascript_Core tests
MOCK run_and_throw_if_fail: ['mock-run-javacriptcore-tests'], cwd=/mock-checkout
+Running WebKit unit tests
+MOCK run_and_throw_if_fail: ['mock-run-webkit-unit-tests'], cwd=/mock-checkout
Running run-webkit-tests
MOCK run_and_throw_if_fail: ['mock-run-webkit-tests', '--quiet'], cwd=/mock-checkout
Committed r49824: <http://trac.webkit.org/changeset/49824>
@@ -149,7 +151,7 @@
self.assert_execute_outputs(LandCowboy(), [50000], options=self._default_options(), expected_stderr=expected_stderr, tool=mock_tool)
def test_land_red_builders(self):
- expected_stderr = 'Building WebKit\nRunning Python unit tests\nRunning Perl unit tests\nRunning _javascript_Core tests\nRunning run-webkit-tests\nCommitted r49824: <http://trac.webkit.org/changeset/49824>\nUpdating bug 50000\n'
+ expected_stderr = 'Building WebKit\nRunning Python unit tests\nRunning Perl unit tests\nRunning _javascript_Core tests\nRunning WebKit unit tests\nRunning run-webkit-tests\nCommitted r49824: <http://trac.webkit.org/changeset/49824>\nUpdating bug 50000\n'
mock_tool = MockTool()
mock_tool.buildbot.light_tree_on_fire()
self.assert_execute_outputs(Land(), [50000], options=self._default_options(), expected_stderr=expected_stderr, tool=mock_tool)
@@ -176,6 +178,7 @@
Running Python unit tests
Running Perl unit tests
Running _javascript_Core tests
+Running WebKit unit tests
Running run-webkit-tests
Committed r49824: <http://trac.webkit.org/changeset/49824>
Not closing bug 50000 as attachment 10000 has review=+. Assuming there are more patches to land from this bug.
@@ -192,6 +195,7 @@
Running Python unit tests
Running Perl unit tests
Running _javascript_Core tests
+Running WebKit unit tests
Running run-webkit-tests
Committed r49824: <http://trac.webkit.org/changeset/49824>
Not closing bug 50000 as attachment 10000 has review=+. Assuming there are more patches to land from this bug.
@@ -201,6 +205,7 @@
Running Python unit tests
Running Perl unit tests
Running _javascript_Core tests
+Running WebKit unit tests
Running run-webkit-tests
Committed r49824: <http://trac.webkit.org/changeset/49824>
Not closing bug 50000 as attachment 10000 has review=+. Assuming there are more patches to land from this bug.
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py (104637 => 104638)
--- trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2012-01-10 23:33:59 UTC (rev 104637)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2012-01-10 23:35:33 UTC (rev 104638)
@@ -61,6 +61,11 @@
log("Running _javascript_Core tests")
self._tool.executive.run_and_throw_if_fail(_javascript_core_tests_command, quiet=True, cwd=self._tool.scm().checkout_root)
+ webkit_unit_tests_command = self._tool.port().run_webkit_unit_tests_command()
+ if webkit_unit_tests_command:
+ log("Running WebKit unit tests")
+ self._tool.executive.run_and_throw_if_fail(webkit_unit_tests_command, cwd=self._tool.scm().checkout_root)
+
log("Running run-webkit-tests")
args = self._tool.port().run_webkit_tests_command()
if self._options.non_interactive:
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/runtests_unittest.py (104637 => 104638)
--- trunk/Tools/Scripts/webkitpy/tool/steps/runtests_unittest.py 2012-01-10 23:33:59 UTC (rev 104637)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/runtests_unittest.py 2012-01-10 23:35:33 UTC (rev 104638)
@@ -39,6 +39,7 @@
tool._deprecated_port.run_perl_unittests_command = lambda: None
step = RunTests(tool, MockOptions(test=True, non_interactive=True, quiet=False))
expected_stderr = """Running _javascript_Core tests
+Running WebKit unit tests
Running run-webkit-tests
"""
OutputCapture().assert_outputs(self, step.run, [{}], expected_stderr=expected_stderr)
