run-webkit-tests fails when there is a curly brace in Xcode build output

https://bugs.webkit.org/show_bug.cgi?id=181254
<rdar://problem/36453374>

Reviewed by Daniel Bates.

* Scripts/webkitpy/port/base.py:
(Port._run_script): Encode script output before logging it.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@227222 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c842bd2..18267ad 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2018-01-19  Jonathan Bedard  <jbedard@apple.com>
+
+        run-webkit-tests fails when there is a curly brace in Xcode build output
+        https://bugs.webkit.org/show_bug.cgi?id=181254
+        <rdar://problem/36453374>
+
+        Reviewed by Daniel Bates.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port._run_script): Encode script output before logging it.
+
 2018-01-19  Chris Dumez  <cdumez@apple.com>
 
         Service worker registrations restored from disk may not be reused when the JS calls register() again

diff --git a/Tools/Scripts/webkitpy/port/base.py b/Tools/Scripts/webkitpy/port/base.py
index 22e919f..c2de1fb 100644 (file)
--- a/Tools/Scripts/webkitpy/port/base.py
+++ b/Tools/Scripts/webkitpy/port/base.py
@@ -1426,7 +1426,7 @@ class Port(object):
         if args:
             run_script_command.extend(args)
         output = self._executive.run_command(run_script_command, cwd=self.webkit_base(), decode_output=decode_output, env=env)
-        _log.debug('Output of %s:\n%s' % (run_script_command, output))
+        _log.debug('Output of %s:\n%s' % (run_script_command, output.encode('utf-8') if decode_output else output))
         return output
 
     def _build_driver(self):