Title: [106460] trunk/Tools
- Revision
- 106460
- Author
- [email protected]
- Date
- 2012-02-01 02:37:14 -0800 (Wed, 01 Feb 2012)
Log Message
[Qt][WK2] run-webkit-tests --qt crashes if WEBKIT_TESTFONTS is not set
https://bugs.webkit.org/show_bug.cgi?id=77466
Patch by Jesus Sanchez-Palencia <[email protected]> on 2012-02-01
Reviewed by Kenneth Rohde Christiansen.
Replicate the behavior of old-run-webkit-tests and check if WEBKIT_TESTFONTS
is set or if we should raise an error.
* Scripts/webkitpy/layout_tests/port/qt.py:
(QtPort.setup_environ_for_server):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (106459 => 106460)
--- trunk/Tools/ChangeLog 2012-02-01 10:31:15 UTC (rev 106459)
+++ trunk/Tools/ChangeLog 2012-02-01 10:37:14 UTC (rev 106460)
@@ -1,3 +1,16 @@
+2012-02-01 Jesus Sanchez-Palencia <[email protected]>
+
+ [Qt][WK2] run-webkit-tests --qt crashes if WEBKIT_TESTFONTS is not set
+ https://bugs.webkit.org/show_bug.cgi?id=77466
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Replicate the behavior of old-run-webkit-tests and check if WEBKIT_TESTFONTS
+ is set or if we should raise an error.
+
+ * Scripts/webkitpy/layout_tests/port/qt.py:
+ (QtPort.setup_environ_for_server):
+
2012-02-01 Philippe Normand <[email protected]> and Sergio Villar Senin <[email protected]>
Reviewed by Martin Robinson.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py (106459 => 106460)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-02-01 10:31:15 UTC (rev 106459)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-02-01 10:37:14 UTC (rev 106460)
@@ -31,6 +31,7 @@
import logging
import re
import sys
+import os
import webkit
@@ -132,6 +133,11 @@
return None
def setup_environ_for_server(self, server_name=None):
+ if not 'WEBKIT_TESTFONTS' in os.environ:
+ print "\n\nThe WEBKIT_TESTFONTS environment variable is not defined or not set properly"
+ print "You must set it before running the tests."
+ print "Use git to grab the actual fonts from http://gitorious.org/qtwebkit/testfonts\n"
+ sys.exit(1)
clean_env = WebKitPort.setup_environ_for_server(self, server_name)
clean_env['QTWEBKIT_PLUGIN_PATH'] = self._build_path('lib/plugins')
self._copy_value_from_environ_if_set(clean_env, 'QT_DRT_WEBVIEW_MODE')
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
