Title: [98823] trunk/Tools
- Revision
- 98823
- Author
- [email protected]
- Date
- 2011-10-29 20:06:10 -0700 (Sat, 29 Oct 2011)
Log Message
new-run-webkit-tests is locale dependent
https://bugs.webkit.org/show_bug.cgi?id=68691
Unreviewed.
Fix the Qt port and unittest the function so we don't break it again.
* Scripts/webkitpy/layout_tests/port/qt.py:
* Scripts/webkitpy/layout_tests/port/qt_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (98822 => 98823)
--- trunk/Tools/ChangeLog 2011-10-30 00:45:50 UTC (rev 98822)
+++ trunk/Tools/ChangeLog 2011-10-30 03:06:10 UTC (rev 98823)
@@ -3,6 +3,18 @@
new-run-webkit-tests is locale dependent
https://bugs.webkit.org/show_bug.cgi?id=68691
+ Unreviewed.
+
+ Fix the Qt port and unittest the function so we don't break it again.
+
+ * Scripts/webkitpy/layout_tests/port/qt.py:
+ * Scripts/webkitpy/layout_tests/port/qt_unittest.py:
+
+2011-10-29 Eric Seidel <[email protected]>
+
+ new-run-webkit-tests is locale dependent
+ https://bugs.webkit.org/show_bug.cgi?id=68691
+
Reviewed by Adam Barth.
Make NRWT use a clean environment just like ORWT did.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py (98822 => 98823)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2011-10-30 00:45:50 UTC (rev 98822)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2011-10-30 03:06:10 UTC (rev 98823)
@@ -143,8 +143,8 @@
def setup_environ_for_server(self, server_name=None):
clean_env = WebKitPort.setup_environ_for_server(self, server_name)
clean_env['QTWEBKIT_PLUGIN_PATH'] = self._build_path('lib/plugins')
- self._copy_value_from_environment(clean_env, 'QT_DRT_WEBVIEW_MODE')
- return env
+ self._copy_value_from_environ_if_set(clean_env, 'QT_DRT_WEBVIEW_MODE')
+ return clean_env
# FIXME: We should find a way to share this implmentation with Gtk,
# or teach run-launcher how to call run-safari and move this down to WebKitPort.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py (98822 => 98823)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py 2011-10-30 00:45:50 UTC (rev 98822)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py 2011-10-30 03:06:10 UTC (rev 98823)
@@ -82,3 +82,8 @@
port._executive = MockExecutive(should_log=True)
expected_stderr = "MOCK run_command: ['Tools/Scripts/run-launcher', '--release', '--qt', 'file://test.html'], cwd=/mock-checkout\n"
OutputCapture().assert_outputs(self, port.show_results_html_file, ["test.html"], expected_stderr=expected_stderr)
+
+ def test_setup_environ_for_server(self):
+ port = self.make_port()
+ env = port.setup_environ_for_server(port.driver_name())
+ self.assertEquals(env['QTWEBKIT_PLUGIN_PATH'], 'MOCK output of child process/lib/plugins')
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
