Changeset 107273 in webkit

Timestamp:

Feb 9, 2012 12:18:48 PM (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-09
Reviewed by Dirk Pranke.

Replicate the behavior of old-run-webkit-tests and check if WEBKIT_TESTFONTS
is set or if we should raise an error. A unit test was added.

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

(QtPort.operating_system):
(QtPort):
(QtPort.check_sys_deps):

• Scripts/webkitpy/layout_tests/port/qt_unittest.py:

(QtPortTest.test_operating_system):
(QtPortTest):
(QtPortTest.test_check_sys_deps):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2012-02-09  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 Dirk Pranke.
+
+        Replicate the behavior of old-run-webkit-tests and check if WEBKIT_TESTFONTS
+        is set or if we should raise an error. A unit test was added.
+
+        * Scripts/webkitpy/layout_tests/port/qt.py:
+        (QtPort.operating_system):
+        (QtPort):
+        (QtPort.check_sys_deps):
+        * Scripts/webkitpy/layout_tests/port/qt_unittest.py:
+        (QtPortTest.test_operating_system):
+        (QtPortTest):
+        (QtPortTest.test_check_sys_deps):
+
 2012-02-09  Eric Seidel  <eric@webkit.org>
 

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

@@ -32 +32 @@
 import re
 import sys
+import os
 
 import webkit
@@ -149 +150 @@
     def operating_system(self):
         return self._operating_system
+
+    def check_sys_deps(self, needs_http):
+        result = super(QtPort, self).check_sys_deps(needs_http)
+        if not 'WEBKIT_TESTFONTS' in os.environ:
+            _log.error('\nThe WEBKIT_TESTFONTS environment variable is not defined or not set properly.')
+            _log.error('You must set it before running the tests.')
+            _log.error('Use git to grab the actual fonts from http://gitorious.org/qtwebkit/testfonts')
+            return False
+        return result

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

@@ -28 +28 @@
 
 import unittest
+import os
 
 from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2
@@ -87 +88 @@
         self.assertEqual('mac', self.make_port(os_name='mac').operating_system())
         self.assertEqual('win', self.make_port(port_name='qt-win', os_name='win').operating_system())
+
+    def test_check_sys_deps(self):
+        port = self.make_port()
+
+        # Success
+        os.environ['WEBKIT_TESTFONTS'] = '/tmp/foo'
+        port._executive = MockExecutive2(exit_code=0)
+        self.assertTrue(port.check_sys_deps(needs_http=False))
+
+        # Failure
+        del os.environ['WEBKIT_TESTFONTS']
+        port._executive = MockExecutive2(exit_code=1,
+            output='testing output failure')
+        self.assertFalse(port.check_sys_deps(needs_http=False))