Title: [139973] trunk/Tools
- Revision
- 139973
- Author
- zandober...@gmail.com
- Date
- 2013-01-17 01:58:56 -0800 (Thu, 17 Jan 2013)
Log Message
[GTK][EFL] NWRT should check that Xvfb is installed
https://bugs.webkit.org/show_bug.cgi?id=71767
Reviewed by Dirk Pranke.
EFL and GTK ports now check that Xvfb is installed before running
layout tests. The command line used to check whether Xvfb is present
is a simple `which Xvfb` that should return 0 as the exit code upon
success.
* Scripts/webkitpy/layout_tests/port/efl.py:
(EflPort.show_results_html_file):
(EflPort):
(EflPort.check_sys_deps):
* Scripts/webkitpy/layout_tests/port/gtk.py:
(GtkPort.check_sys_deps):
* Scripts/webkitpy/layout_tests/port/xvfbdriver.py:
(XvfbDriver):
(XvfbDriver.check_xvfb):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (139972 => 139973)
--- trunk/Tools/ChangeLog 2013-01-17 09:07:04 UTC (rev 139972)
+++ trunk/Tools/ChangeLog 2013-01-17 09:58:56 UTC (rev 139973)
@@ -1,3 +1,25 @@
+2013-01-17 Zan Dobersek <zdober...@igalia.com>
+
+ [GTK][EFL] NWRT should check that Xvfb is installed
+ https://bugs.webkit.org/show_bug.cgi?id=71767
+
+ Reviewed by Dirk Pranke.
+
+ EFL and GTK ports now check that Xvfb is installed before running
+ layout tests. The command line used to check whether Xvfb is present
+ is a simple `which Xvfb` that should return 0 as the exit code upon
+ success.
+
+ * Scripts/webkitpy/layout_tests/port/efl.py:
+ (EflPort.show_results_html_file):
+ (EflPort):
+ (EflPort.check_sys_deps):
+ * Scripts/webkitpy/layout_tests/port/gtk.py:
+ (GtkPort.check_sys_deps):
+ * Scripts/webkitpy/layout_tests/port/xvfbdriver.py:
+ (XvfbDriver):
+ (XvfbDriver.check_xvfb):
+
2013-01-16 Alan Cutter <alancut...@chromium.org>
sheriffbot can't tell me who "kov" is
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py (139972 => 139973)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py 2013-01-17 09:07:04 UTC (rev 139972)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py 2013-01-17 09:58:56 UTC (rev 139973)
@@ -125,3 +125,6 @@
# FIXME: old-run-webkit-tests also added ["-graphicssystem", "raster", "-style", "windows"]
# FIXME: old-run-webkit-tests converted results_filename path for cygwin.
self._run_script("run-launcher", run_launcher_args)
+
+ def check_sys_deps(self, needs_http):
+ return super(EflPort, self).check_sys_deps(needs_http) and XvfbDriver.check_xvfb(self)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py (139972 => 139973)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2013-01-17 09:07:04 UTC (rev 139972)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2013-01-17 09:58:56 UTC (rev 139973)
@@ -124,6 +124,9 @@
# FIXME: old-run-webkit-tests converted results_filename path for cygwin.
self._run_script("run-launcher", run_launcher_args)
+ def check_sys_deps(self, needs_http):
+ return super(GtkPort, self).check_sys_deps(needs_http) and XvfbDriver.check_xvfb(self)
+
def _get_gdb_output(self, coredump_path):
cmd = ['gdb', '-ex', 'thread apply all bt 1024', '--batch', str(self._path_to_driver()), coredump_path]
proc = subprocess.Popen(cmd, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py (139972 => 139973)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py 2013-01-17 09:07:04 UTC (rev 139972)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py 2013-01-17 09:58:56 UTC (rev 139973)
@@ -39,6 +39,13 @@
class XvfbDriver(Driver):
+ @staticmethod
+ def check_xvfb(port):
+ xvfb_found = port.host.executive.run_command(['which', 'Xvfb'], return_exit_code=True) is 0
+ if not xvfb_found:
+ _log.error("No Xvfb found. Cannot run layout tests.")
+ return xvfb_found
+
def __init__(self, *args, **kwargs):
Driver.__init__(self, *args, **kwargs)
self._guard_lock = None
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
