Title: [267350] trunk/Tools
- Revision
- 267350
- Author
- commit-qu...@webkit.org
- Date
- 2020-09-21 11:58:57 -0700 (Mon, 21 Sep 2020)
Log Message
[GTK][WPE] Missing support for multi-word $WEBKIT_MINI_BROWSER_PREFIX
https://bugs.webkit.org/show_bug.cgi?id=216604
Patch by Philippe Normand <pnorm...@igalia.com> on 2020-09-21
Reviewed by Adrian Perez de Castro.
Gracefully handle cases where the env var contains multiple words, by splitting its contents
to a list and inserting it at the beginning of the final minibrowser command.
* Scripts/webkitpy/port/gtk.py:
(GtkPort.run_minibrowser):
* Scripts/webkitpy/port/wpe.py:
(WPEPort.run_minibrowser):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (267349 => 267350)
--- trunk/Tools/ChangeLog 2020-09-21 18:56:24 UTC (rev 267349)
+++ trunk/Tools/ChangeLog 2020-09-21 18:58:57 UTC (rev 267350)
@@ -1,3 +1,18 @@
+2020-09-21 Philippe Normand <pnorm...@igalia.com>
+
+ [GTK][WPE] Missing support for multi-word $WEBKIT_MINI_BROWSER_PREFIX
+ https://bugs.webkit.org/show_bug.cgi?id=216604
+
+ Reviewed by Adrian Perez de Castro.
+
+ Gracefully handle cases where the env var contains multiple words, by splitting its contents
+ to a list and inserting it at the beginning of the final minibrowser command.
+
+ * Scripts/webkitpy/port/gtk.py:
+ (GtkPort.run_minibrowser):
+ * Scripts/webkitpy/port/wpe.py:
+ (WPEPort.run_minibrowser):
+
2020-09-21 Kate Cheney <katherine_che...@apple.com>
Allow about:blank subframe loads for non app-bound top frames
Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (267349 => 267350)
--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2020-09-21 18:56:24 UTC (rev 267349)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2020-09-21 18:58:57 UTC (rev 267350)
@@ -31,6 +31,7 @@
import os
import uuid
import logging
+import shlex
from webkitpy.common.system import path
from webkitpy.common.memoized import memoized
@@ -269,7 +270,8 @@
return 1
command = [miniBrowser]
if os.environ.get("WEBKIT_MINI_BROWSER_PREFIX"):
- command.insert(0, os.environ["WEBKIT_MINI_BROWSER_PREFIX"])
+ command = shlex.split(os.environ["WEBKIT_MINI_BROWSER_PREFIX"]) + command
+
if self._should_use_jhbuild():
command = self._jhbuild_wrapper + command
return self._executive.run_command(command + args, cwd=self.webkit_base(), stdout=None, return_stderr=False, decode_output=False)
Modified: trunk/Tools/Scripts/webkitpy/port/wpe.py (267349 => 267350)
--- trunk/Tools/Scripts/webkitpy/port/wpe.py 2020-09-21 18:56:24 UTC (rev 267349)
+++ trunk/Tools/Scripts/webkitpy/port/wpe.py 2020-09-21 18:58:57 UTC (rev 267350)
@@ -27,6 +27,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import os
+import shlex
from webkitpy.common.system import path
from webkitpy.common.memoized import memoized
@@ -146,7 +147,8 @@
return 1
command = [miniBrowser]
if os.environ.get("WEBKIT_MINI_BROWSER_PREFIX"):
- command.insert(0, os.environ["WEBKIT_MINI_BROWSER_PREFIX"])
+ command = shlex.split(os.environ["WEBKIT_MINI_BROWSER_PREFIX"]) + command
+
if self._should_use_jhbuild():
command = self._jhbuild_wrapper + command
return self._executive.run_command(command + args, cwd=self.webkit_base(), stdout=None, return_stderr=False, decode_output=False)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
