Unreviewed, rolling out r106460.

http://trac.webkit.org/changeset/106460
https://bugs.webkit.org/show_bug.cgi?id=77552

It break unit tests if WEBKIT_TESTFONTS isn't defined.
(Requested by Ossy on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-02-01

* Scripts/webkitpy/layout_tests/port/qt.py:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106466 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 0baaafb..7f34260 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2012-02-01  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r106460.
+        http://trac.webkit.org/changeset/106460
+        https://bugs.webkit.org/show_bug.cgi?id=77552
+
+        It break unit tests if WEBKIT_TESTFONTS isn't defined.
+        (Requested by Ossy on #webkit).
+
+        * Scripts/webkitpy/layout_tests/port/qt.py:
+
 2012-02-01  Nándor Huszka  <huszka.nandor@stud.u-szeged.hu>
 
         [Qt] Automatic clean build feature always do clean build with --no-webkit2

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/qt.py b/Tools/Scripts/webkitpy/layout_tests/port/qt.py
index 79c3585..2445876 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/qt.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/qt.py
@@ -31,7 +31,6 @@
 import logging
 import re
 import sys
-import os
 
 import webkit
 
@@ -133,11 +132,6 @@ class QtPort(WebKitPort):
         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')