Skip to content

Fix stdout encoding for python2 and python3 in test262-harness.py #4499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lygstate wants to merge 1 commit into from
Closed

Fix stdout encoding for python2 and python3 in test262-harness.py #4499

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions tools/runners/test262-harness.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,15 @@ def is_windows():
return (actual_platform == 'Windows') or (actual_platform == 'Microsoft')


def write_text_to(target, text):
if sys.version_info >= (3, 0):
target.buffer.write(text.encode(target.encoding or "utf8", "ignore"))
target.buffer.flush()
else:
target.write(text.encode("utf8", errors="ignore"))
target.flush()


class TempFile(object):

def __init__(self, suffix="", prefix="tmp", text=False):
Expand Down Expand Up @@ -452,12 +461,12 @@ def report_outcome(self, long_format):
def write_output(self, target):
out = self.stdout.strip()
if out:
target.write("--- output --- \n %s" % out)
write_text_to(target, u"--- output --- \n%s\n" % out)
error = self.stderr.strip()
if error:
target.write("--- errors --- \n %s" % error)
write_text_to(target, u"--- errors --- \n%s\n" % error)

target.write("\n--- exit code: %d ---\n" % self.exit_code)
write_text_to(target, u"\n--- exit code: %d ---\n" % self.exit_code)

def has_failed(self):
return self.exit_code != 0
Expand Down