Title: [98193] trunk/Tools
- Revision
- 98193
- Author
- [email protected]
- Date
- 2011-10-22 09:38:27 -0700 (Sat, 22 Oct 2011)
Log Message
[WK2][GTK] Missing env variables cause WKTR to crash
https://bugs.webkit.org/show_bug.cgi?id=70674
Patch by Zan Dobersek <[email protected]> on 2011-10-22
Reviewed by Martin Robinson.
Set two environment variables that the Gtk's port of WebKitTestRunner
depends on and crashes if they're not explicitly set by the user.
Also modify the setting of the WEBKIT_INSPECTOR_PATH variable so it
properly uses the _build_path method.
* Scripts/webkitpy/layout_tests/port/gtk.py: Set
TEST_RUNNER_INJECTED_BUNDLE_FILENAME and TEST_RUNNER_TEST_PLUGIN_PATH
environment variables.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (98192 => 98193)
--- trunk/Tools/ChangeLog 2011-10-22 10:53:41 UTC (rev 98192)
+++ trunk/Tools/ChangeLog 2011-10-22 16:38:27 UTC (rev 98193)
@@ -1,3 +1,19 @@
+2011-10-22 Zan Dobersek <[email protected]>
+
+ [WK2][GTK] Missing env variables cause WKTR to crash
+ https://bugs.webkit.org/show_bug.cgi?id=70674
+
+ Reviewed by Martin Robinson.
+
+ Set two environment variables that the Gtk's port of WebKitTestRunner
+ depends on and crashes if they're not explicitly set by the user.
+ Also modify the setting of the WEBKIT_INSPECTOR_PATH variable so it
+ properly uses the _build_path method.
+
+ * Scripts/webkitpy/layout_tests/port/gtk.py: Set
+ TEST_RUNNER_INJECTED_BUNDLE_FILENAME and TEST_RUNNER_TEST_PLUGIN_PATH
+ environment variables.
+
2011-10-21 Filip Pizlo <[email protected]>
Bencher script doesn't measure GC times accurately
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py (98192 => 98193)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2011-10-22 10:53:41 UTC (rev 98192)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2011-10-22 16:38:27 UTC (rev 98193)
@@ -76,7 +76,9 @@
environment = webkit.WebKitPort.setup_environ_for_server(self, server_name)
environment['GTK_MODULES'] = 'gail'
environment['LIBOVERLAY_SCROLLBAR'] = '0'
- environment['WEBKIT_INSPECTOR_PATH'] = self._build_path('Programs/resources/inspector')
+ environment['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('Libraries', 'libTestRunnerInjectedBundle.la')
+ environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('Libraries', 'TestNetscapePlugin')
+ environment['WEBKIT_INSPECTOR_PATH'] = self._build_path('Programs', 'resources', 'inspector')
return environment
def _generate_all_test_configurations(self):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
