Changeset 77720 in webkit

Timestamp:

Feb 4, 2011 6:39:01 PM (13 years ago)

Author:

tony@chromium.org

Message:

2011-02-04 Tony Chang <​tony@chromium.org>

Reviewed by Eric Seidel.

get test-webkitpy running on win32 python
​https://bugs.webkit.org/show_bug.cgi?id=53822

The test harness crashes with a WindowsError because it can't find
'svn' when using subprocess.Popen. This gets us past the error
so we can see the failing tests on the Chromium Win Release Tests
bot.

• Scripts/webkitpy/common/system/executive.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/executive.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-02-04  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        get test-webkitpy running on win32 python
+        https://bugs.webkit.org/show_bug.cgi?id=53822
+
+        The test harness crashes with a WindowsError because it can't find
+        'svn' when using subprocess.Popen.  This gets us past the error
+        so we can see the failing tests on the Chromium Win Release Tests
+        bot.
+
+        * Scripts/webkitpy/common/system/executive.py:
+
 2011-02-04  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Tools/Scripts/webkitpy/common/system/executive.py

@@ -112 +112 @@
         return sys.platform not in ('win32', 'cygwin')
 
+    def _should_use_shell(self):
+        # On Windows, if we don't use the shell, we don't search %PATH% to
+        # find the command-- an absolute path is required.
+        return sys.platform.startswith('win')
+
     def _run_command_with_teed_output(self, args, teed_output):
         args = map(unicode, args)  # Popen will throw an exception if args are non-strings (like int())
@@ -119 +124 @@
                                          stdout=subprocess.PIPE,
                                          stderr=subprocess.STDOUT,
-                                         close_fds=self._should_close_fds())
+                                         close_fds=self._should_close_fds(),
+                                         shell=self._should_use_shell())
 
         # Use our own custom wait loop because Popen ignores a tee'd
@@ -352 +358 @@
                                    stderr=stderr,
                                    cwd=cwd,
-                                   close_fds=self._should_close_fds())
+                                   close_fds=self._should_close_fds(),
+                                   shell=self._should_use_shell())
         output = process.communicate(string_to_communicate)[0]