Title: [136522] trunk/Tools
- Revision
- 136522
- Author
- zandober...@gmail.com
- Date
- 2012-12-04 10:12:59 -0800 (Tue, 04 Dec 2012)
Log Message
[GTK] Insert the jhbuild wrapper command at the beginning of the command list
https://bugs.webkit.org/show_bug.cgi?id=103991
Reviewed by Martin Robinson.
Insert the Tools/gtk/run-with-jhbuild wrapper at the beginning of the
command that's being formed in multiprocessing bootstrap. The wrapper is
an executable Python script while the command being wrapped perhaps isn't
and therefore requires the Python interpreter to be listed at the beginning
of the command sublist that is then executed by the wrapper.
Specifically, the webkitpy/layout_tests/run_webkit_tests.py module file
is about to lose the executable bit and the Python-signaling shebang line.
The Jhbuild wrapper simply executes the command that's passed, but that errs
in this case unless the Python executable is executed and the module file
is passed to it as an argument.
* Scripts/webkitpy/common/multiprocessing_bootstrap.py:
(run):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (136521 => 136522)
--- trunk/Tools/ChangeLog 2012-12-04 18:04:21 UTC (rev 136521)
+++ trunk/Tools/ChangeLog 2012-12-04 18:12:59 UTC (rev 136522)
@@ -1,3 +1,25 @@
+2012-12-04 Zan Dobersek <zandober...@gmail.com>
+
+ [GTK] Insert the jhbuild wrapper command at the beginning of the command list
+ https://bugs.webkit.org/show_bug.cgi?id=103991
+
+ Reviewed by Martin Robinson.
+
+ Insert the Tools/gtk/run-with-jhbuild wrapper at the beginning of the
+ command that's being formed in multiprocessing bootstrap. The wrapper is
+ an executable Python script while the command being wrapped perhaps isn't
+ and therefore requires the Python interpreter to be listed at the beginning
+ of the command sublist that is then executed by the wrapper.
+
+ Specifically, the webkitpy/layout_tests/run_webkit_tests.py module file
+ is about to lose the executable bit and the Python-signaling shebang line.
+ The Jhbuild wrapper simply executes the command that's passed, but that errs
+ in this case unless the Python executable is executed and the module file
+ is passed to it as an argument.
+
+ * Scripts/webkitpy/common/multiprocessing_bootstrap.py:
+ (run):
+
2012-12-04 Peter Beverloo <pe...@chromium.org>
Add the Chromium Android Release (Perf) bot
Modified: trunk/Tools/Scripts/webkitpy/common/multiprocessing_bootstrap.py (136521 => 136522)
--- trunk/Tools/Scripts/webkitpy/common/multiprocessing_bootstrap.py 2012-12-04 18:04:21 UTC (rev 136521)
+++ trunk/Tools/Scripts/webkitpy/common/multiprocessing_bootstrap.py 2012-12-04 18:12:59 UTC (rev 136522)
@@ -58,7 +58,7 @@
# doesn't need to do it and their process id as reported by
# subprocess.Popen is not jhbuild's.
if '--gtk' in sys.argv[1:] and os.path.exists(os.path.join(script_dir, '..', '..', 'WebKitBuild', 'Dependencies')):
- cmd.insert(1, os.path.join(script_dir, '..', 'gtk', 'run-with-jhbuild'))
+ cmd.insert(0, os.path.join(script_dir, '..', 'gtk', 'run-with-jhbuild'))
proc = subprocess.Popen(cmd, env=env)
try:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
