[GTK] Fix missing UTF-8 decoding in test crash logs

ntrrgc · ntrrgc · commit 49b6ae496210 · 2021-09-01T15:05:58.000Z
https://bugs.webkit.org/show_bug.cgi?id=229760 Reviewed by Philippe Normand. Fix a couple of decoding issues in linux_get_crash_log.py, where bytestrings were being printed without decoding. An addditional decoding issue was fixed by Philippe Normand in driver.py when printing ASan results. * Scripts/webkitpy/port/driver.py: (Driver._read_block): * Scripts/webkitpy/port/linux_get_crash_log.py: (GDBCrashLogGenerator._get_trace_from_flatpak): (GDBCrashLogGenerator.generate_crash_log): Canonical link: https://commits.webkit.org/241181@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281849 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,22 @@
+2021-09-01  Alicia Boya García  <aboya@igalia.com>
+
+        [GTK] Fix missing UTF-8 decoding in test crash logs
+        https://bugs.webkit.org/show_bug.cgi?id=229760
+
+        Reviewed by Philippe Normand.
+
+        Fix a couple of decoding issues in linux_get_crash_log.py, where
+        bytestrings were being printed without decoding.
+
+        An addditional decoding issue was fixed by Philippe Normand in
+        driver.py when printing ASan results.
+
+        * Scripts/webkitpy/port/driver.py:
+        (Driver._read_block):
+        * Scripts/webkitpy/port/linux_get_crash_log.py:
+        (GDBCrashLogGenerator._get_trace_from_flatpak):
+        (GDBCrashLogGenerator.generate_crash_log):
+
 2021-08-31  Chris Dumez  <cdumez@apple.com>
 
         Enable SharedArrayBuffer support when COOP/COEP headers are used
diff --git a/Tools/Scripts/webkitpy/port/driver.py b/Tools/Scripts/webkitpy/port/driver.py
@@ -732,7 +732,7 @@ def _read_block(self, deadline, test_name, wait_for_stderr_eof=False):
                     break
                 elif self._check_for_address_sanitizer_violation(err_line):
                     asan_violation_detected = True
-                    self._crash_report_from_driver = b''
+                    self._crash_report_from_driver = ''
                     # ASan report starts with a nondescript line, we only detect the second line.
                     end_of_previous_error_line = self.error_from_test.rfind('\n', 0, -1)
                     if end_of_previous_error_line > 0:
diff --git a/Tools/Scripts/webkitpy/port/linux_get_crash_log.py b/Tools/Scripts/webkitpy/port/linux_get_crash_log.py
@@ -121,7 +121,8 @@ def _get_trace_from_flatpak(self):
 
         proc = self._executive.popen(cmd, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         crash_log, stderr = proc.communicate()
-        errors = string_utils.decode(str(stderr or '<empty>'), errors='ignore').splitlines()
+        crash_log = string_utils.decode(crash_log, errors='ignore')
+        errors = string_utils.decode(stderr or '<empty>', errors='ignore').splitlines()
         return crash_log, errors
 
     def generate_crash_log(self, stdout, stderr):
@@ -156,7 +157,7 @@ def match_filename(filesystem, directory, filename):
         elif coredumpctl:
             crash_log, errors = self._get_trace_from_systemd(coredumpctl, pid_representation)
 
-        stderr_lines = errors + string_utils.decode(str(stderr or '<empty>'), errors='ignore').splitlines()
+        stderr_lines = errors + string_utils.decode(stderr or '<empty>', errors='ignore').splitlines()
         errors_str = '\n'.join(('STDERR: ' + stderr_line) for stderr_line in stderr_lines)
         cppfilt_proc = self._executive.popen(
             ['c++filt'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
