Changeset 106460 in webkit

Timestamp:

Feb 1, 2012 2:37:14 AM (12 years ago)

Author:

commit-queue@webkit.org

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 <​jesus.palencia@openbossa.org> 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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/qt.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-02-01  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        [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  <pnormand@igalia.com> and Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py

@@ -32 +32 @@
 import re
 import sys
+import os
 
 import webkit
@@ -133 +134 @@
 
     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')