Changeset 98193 in webkit

Timestamp:

Oct 22, 2011 9:38:27 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[WK2][GTK] Missing env variables cause WKTR to crash
​https://bugs.webkit.org/show_bug.cgi?id=70674

Patch by Zan Dobersek <​zandobersek@gmail.com> 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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/gtk.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-10-22  Zan Dobersek  <zandobersek@gmail.com>
+
+        [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  <fpizlo@apple.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py

@@ -77 +77 @@
         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