Modified: trunk/Tools/ChangeLog (213113 => 213114)
--- trunk/Tools/ChangeLog 2017-02-28 02:18:17 UTC (rev 213113)
+++ trunk/Tools/ChangeLog 2017-02-28 02:24:56 UTC (rev 213114)
@@ -1,5 +1,19 @@
2017-02-27 Srinivasan Vijayaraghavan <[email protected]>
+ Windows regression: webkitpy.tool.steps.steps_unittest.StepsTest.test_runtests_jsc[_debug]
+ https://bugs.webkit.org/show_bug.cgi?id=168628
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/webkitpy/tool/steps/runtests.py:
+ (RunTests._run_javascriptcore_tests): Pass options to the Base instance.
+ * Scripts/webkitpy/tool/steps/steps_unittest.py:
+ (StepsTest._step_options): Add a new 'root' option that's passed through to the Base instance.
+ (test_runtests_jsc): Not running webkit-build-directory anymore, and changed json output directory.
+ (test_runtests_jsc_debug): Ditto
+
+2017-02-27 Srinivasan Vijayaraghavan <[email protected]>
+
Add machine-readable results for bindings tests
https://bugs.webkit.org/show_bug.cgi?id=168626
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py (213113 => 213114)
--- trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2017-02-28 02:18:17 UTC (rev 213113)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2017-02-28 02:24:56 UTC (rev 213114)
@@ -153,7 +153,7 @@
def _run_javascriptcore_tests(self):
args = self._tool.deprecated_port().run_javascriptcore_tests_command(self._options.build_style)
- results_directory = self._tool.port_factory.get().jsc_results_directory()
+ results_directory = self._tool.port_factory.get(options=self._options).jsc_results_directory()
results_file_path = self._tool.filesystem.join(results_directory, "jsc_test_results.json")
args.append("--json-output=%s" % results_file_path)
self._tool.executive.run_and_throw_if_fail(args, cwd=self._tool.scm().checkout_root)
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py (213113 => 213114)
--- trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py 2017-02-28 02:18:17 UTC (rev 213113)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py 2017-02-28 02:24:56 UTC (rev 213114)
@@ -46,6 +46,7 @@
options.quiet = True
options.test = True
options.iterate_on_new_tests = 0
+ options.root = '/tmp'
return options
def _run_step(self, step, tool=None, options=None, state=None):
@@ -154,8 +155,7 @@
# FIXME: We shouldn't use a real port-object here, but there is too much to mock at the moment.
tool._deprecated_port = DeprecatedPort()
step = steps.RunTests(tool, mock_options)
- expected_logs = """MOCK run_command: ['perl', 'Tools/Scripts/webkit-build-directory', '--configuration', '--release', '--mac'], cwd=/mock-checkout
-MOCK run_and_throw_if_fail: ['Tools/Scripts/run-_javascript_core-tests', '--no-fail-fast', '--release', '--json-output=/MOCK output of child process/jsc_test_results.json'], cwd=/mock-checkout
+ expected_logs = """MOCK run_and_throw_if_fail: ['Tools/Scripts/run-_javascript_core-tests', '--no-fail-fast', '--release', '--json-output=/tmp/jsc_test_results.json'], cwd=/mock-checkout
"""
OutputCapture().assert_outputs(self, step.run, [{}], expected_logs=expected_logs)
@@ -168,8 +168,7 @@
# FIXME: We shouldn't use a real port-object here, but there is too much to mock at the moment.
tool._deprecated_port = DeprecatedPort()
step = steps.RunTests(tool, mock_options)
- expected_logs = """MOCK run_command: ['perl', 'Tools/Scripts/webkit-build-directory', '--configuration', '--release', '--mac'], cwd=/mock-checkout
-MOCK run_and_throw_if_fail: ['Tools/Scripts/run-_javascript_core-tests', '--no-fail-fast', '--debug', '--json-output=/MOCK output of child process/jsc_test_results.json'], cwd=/mock-checkout
+ expected_logs = """MOCK run_and_throw_if_fail: ['Tools/Scripts/run-_javascript_core-tests', '--no-fail-fast', '--debug', '--json-output=/tmp/jsc_test_results.json'], cwd=/mock-checkout
"""
OutputCapture().assert_outputs(self, step.run, [{}], expected_logs=expected_logs)
