Changeset 173290 in webkit

Timestamp:

Sep 4, 2014 4:47:36 PM (10 years ago)

Author:

Brent Fulgham

Message:

[Win] webkitpy test suite frequently fails to complete
​https://bugs.webkit.org/show_bug.cgi?id=136546

Reviewed by Daniel Bates.

Properly convert the ASCII crash log produced by ntsd into
a unicode string as early as possible so that we handle it
properly when generating our logs and other test support output.

We were mixing ASCII/unicode strings under Windows, which was
causing test system failures when we processed some crash logs.

Also do a better job of handling garbage pid entries in the
Cygwin lock files.

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

(CrashLogs._find_newest_log_win): The ntsd '.logopen' command
creates an ASCII file. Decode it as ASCII, not 'utf-8', and
handle the strings as unicode from that point on.

• Scripts/webkitpy/port/http_lock.py:

(HttpLock._current_lock_pid): Add logging and handle case of
the current_pid failing to cleanly convert to 'int'.

• Scripts/webkitpy/port/win.py:

(WinPort): Add 64-bit architecture as a known target for the
Windows build.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/crashlogs.py (modified) (2 diffs)
• Scripts/webkitpy/port/http_lock.py (modified) (1 diff)
• Scripts/webkitpy/port/win.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-09-04  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] webkitpy test suite frequently fails to complete
+        https://bugs.webkit.org/show_bug.cgi?id=136546
+
+        Reviewed by Daniel Bates.
+
+        Properly convert the ASCII crash log produced by ntsd into
+        a unicode string as early as possible so that we handle it
+        properly when generating our logs and other test support output.
+
+        We were mixing ASCII/unicode strings under Windows, which was
+        causing test system failures when we processed some crash logs.
+
+        Also do a better job of handling garbage pid entries in the
+        Cygwin lock files.
+
+        * Scripts/webkitpy/common/system/crashlogs.py:
+        (CrashLogs._find_newest_log_win): The ntsd '.logopen' command
+        creates an ASCII file. Decode it as ASCII, not 'utf-8', and
+        handle the strings as unicode from that point on.
+        * Scripts/webkitpy/port/http_lock.py:
+        (HttpLock._current_lock_pid): Add logging and handle case of
+        the current_pid failing to cleanly convert to 'int'.
+        * Scripts/webkitpy/port/win.py:
+        (WinPort): Add 64-bit architecture as a known target for the
+        Windows build.
+
 2014-09-04  Andy Estes  <aestes@apple.com>
 

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

@@ -86 +86 @@
 
         logs = self._host.filesystem.files_under(self._results_directory, file_filter=is_crash_log)
-        errors = ''
+        errors = u''
         for path in reversed(sorted(logs)):
             try:
                 if not newer_than or self._host.filesystem.mtime(path) > newer_than:
-                    log_file = self._host.filesystem.read_binary_file(path).decode('utf8', 'ignore')
+                    log_file = self._host.filesystem.read_binary_file(path).decode('ascii', 'ignore')
                     match = self.PID_LINE_REGEX.search(log_file)
                     if match is None:
@@ -99 +99 @@
                 print "IOError %s" % str(e)
                 if include_errors:
-                    errors += "ERROR: Failed to read '%s': %s\n" % (path, str(e))
+                    errors += u"ERROR: Failed to read '%s': %s\n" % (path, str(e))
             except OSError, e:
                 print "OSError %s" % str(e)
                 if include_errors:
-                    errors += "ERROR: Failed to read '%s': %s\n" % (path, str(e))
+                    errors += u"ERROR: Failed to read '%s': %s\n" % (path, str(e))
             except UnicodeDecodeError, e:
                 print "UnicodeDecodeError %s" % str(e)
                 if include_errors:
-                    errors += "ERROR: Failed to decode '%s' as utf8: %s\n" % (path, str(e))
+                    errors += u"ERROR: Failed to decode '%s' as ascii: %s\n" % (path, str(e))
 
         if include_errors and errors:

trunk/Tools/Scripts/webkitpy/port/http_lock.py

@@ -92 +92 @@
             return
         try:
-            current_pid = self._filesystem.read_text_file(lock_list[0])
-            if not (current_pid and self._executive.check_running_pid(int(current_pid))):
-                _log.debug("Removing stuck lock file: %s" % lock_list[0])
+            _log.debug("Retrieving current lock pid from %s" % lock_list[0])
+            current_pid_string = self._filesystem.read_text_file(lock_list[0])
+            _log.debug("Checking current lock on pid %s" % current_pid_string)
+            if not current_pid_string:
+                self._filesystem.remove(lock_list[0])
+                return
+
+            try:
+                current_pid = int(current_pid_string)
+                if not (current_pid and self._executive.check_running_pid(current_pid)):
+                    _log.debug("Removing stuck lock file: %s" % lock_list[0])
+                    self._filesystem.remove(lock_list[0])
+                    return
+            except ValueError, e:
+                _log.debug("ValueError: %s" % e)
                 self._filesystem.remove(lock_list[0])
                 return

trunk/Tools/Scripts/webkitpy/port/win.py

@@ -50 +50 @@
     VERSION_FALLBACK_ORDER = ["win-xp", "win-vista", "win-7sp0", "win"]
 
-    ARCHITECTURES = ['x86']
+    ARCHITECTURES = ['x86', 'x86_64']
 
     CRASH_LOG_PREFIX = "CrashLog"