[lldbtest] Fix some code to be compatible between py2 and py3.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@354297 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/packages/Python/lldbsuite/test/lldbtest.py b/packages/Python/lldbsuite/test/lldbtest.py
index f1b0d9a..4a492b0 100644
--- a/packages/Python/lldbsuite/test/lldbtest.py
+++ b/packages/Python/lldbsuite/test/lldbtest.py
@@ -438,27 +438,13 @@
stdout=PIPE,
stderr=PIPE,
shell=True,
- universal_newlines=True,
+ #encoding="utf-8",
+ #universal_newlines=True,
**kwargs)
pid = process.pid
this_output, this_error = process.communicate()
retcode = process.poll()
- # Enable trace on failure return while tracking down FreeBSD buildbot
- # issues
- trace = traceAlways
- if not trace and retcode and sys.platform.startswith("freebsd"):
- trace = True
-
- with recording(test, trace) as sbuf:
- print(file=sbuf)
- print("os command:", shellCommand, file=sbuf)
- print("with pid:", pid, file=sbuf)
- print("stdout:", this_output, file=sbuf)
- print("stderr:", this_error, file=sbuf)
- print("retcode:", retcode, file=sbuf)
- print(file=sbuf)
-
if retcode:
cmd = kwargs.get("args")
if cmd is None:
@@ -471,8 +457,8 @@
"command": shellCommand
}
raise cpe
- output = output + this_output
- error = error + this_error
+ output = output + this_output.decode("utf-8")
+ error = error + this_error.decode("utf-8")
return (output, error)
