Title: [100350] trunk/Tools
- Revision
- 100350
- Author
- t...@chromium.org
- Date
- 2011-11-15 15:41:53 -0800 (Tue, 15 Nov 2011)
Log Message
Unreviewed fix of ref-tests on GTK+.
If a driver is never started, _xvfb_process is never set.
* Scripts/webkitpy/layout_tests/port/gtk.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (100349 => 100350)
--- trunk/Tools/ChangeLog 2011-11-15 23:40:57 UTC (rev 100349)
+++ trunk/Tools/ChangeLog 2011-11-15 23:41:53 UTC (rev 100350)
@@ -1,3 +1,10 @@
+2011-11-15 Tony Chang <t...@chromium.org>
+
+ Unreviewed fix of ref-tests on GTK+.
+ If a driver is never started, _xvfb_process is never set.
+
+ * Scripts/webkitpy/layout_tests/port/gtk.py:
+
2011-11-14 Tony Chang <t...@chromium.org>
[NRWT] Reftests should run even when pixel tests are disabled.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py (100349 => 100350)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2011-11-15 23:40:57 UTC (rev 100349)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2011-11-15 23:41:53 UTC (rev 100350)
@@ -57,9 +57,10 @@
def stop(self):
WebKitDriver.stop(self)
- # FIXME: This should use Executive.kill_process
- os.kill(self._xvfb_process.pid, signal.SIGTERM)
- self._xvfb_process.wait()
+ if getattr(self, '_xvfb_process', None):
+ # FIXME: This should use Executive.kill_process
+ os.kill(self._xvfb_process.pid, signal.SIGTERM)
+ self._xvfb_process.wait()
class GtkPort(WebKitPort):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
