Changeset 57847 in webkit

Timestamp:

Apr 19, 2010 3:09:33 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

2010-04-19 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Eric Seidel.

Submit a better workaround for r57806 than the one in r57831 - log
an error and exit if you try to run new-run-webkit-tests with --use-drt
on Windows.

​https://bugs.webkit.org/show_bug.cgi?id=37822

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

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-19  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Submit a better workaround for r57806 than the one in r57831 - log
+        an error and exit if you try to run new-run-webkit-tests with --use-drt
+        on Windows.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37822
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+
 2010-04-19  Jesus Sanchez-Palencia  <jesus@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py

@@ -82 +82 @@
         self._chromium_base_dir = None
 
-        # FIXME: see comment above re: import webkit
-        if sys.platform in ('win32', 'cygwin') and options:
-            options.use_drt = False
-
     def baseline_path(self):
         return self._webkit_baseline_path(self._name)
@@ -91 +87 @@
     def check_build(self, needs_http):
         result = True
+
+        # FIXME: see comment above re: import webkit
+        if (sys.platform in ('win32', 'cygwin') and self._options and
+            hasattr(self._options, 'use_drt') and self._options.use_drt):
+            _log.error('--use-drt is not supported on Windows yet')
+            _log.error('')
+            result = False
+
         dump_render_tree_binary_path = self._path_to_driver()
         result = check_file_exists(dump_render_tree_binary_path,
-                                   'test driver')
+                                    'test driver') and result
         if result:
-            result = (self._check_driver_build_up_to_date(self._options.configuration)
-                      and result)
+            result = self._check_driver_build_up_to_date(
+                self._options.configuration)
         else:
             _log.error('')