Skip to content

Commit

Permalink
[Python] Update checkDsymForUUIDIsOn to be compatible with Python 3.
Browse files Browse the repository at this point in the history
Summary:
In python 2, strings and bytes are the same, but they're not in
python 3, hence the return of read() needs an explicit conversion.
While I'm around, rename the return of Popen() from `pipe` to
`process`, as that's what Popen returns.

Reviewers: JDevlieghere, friss, zturner, aprantl, serge-sans-paille

Subscribers: lldb-commits

Differential Revision: https://reviews.llvm.org/D56517

llvm-svn: 350788
  • Loading branch information
dcci committed Jan 10, 2019
1 parent 8d530b7 commit 53dddee
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions lldb/packages/Python/lldbsuite/test/dotest.py
Expand Up @@ -1061,14 +1061,15 @@ def getMyCommandLine():

def checkDsymForUUIDIsNotOn():
cmd = ["defaults", "read", "com.apple.DebugSymbols"]
pipe = subprocess.Popen(
process = subprocess.Popen(
cmd,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
cmd_output = pipe.stdout.read()
if cmd_output and "DBGFileMappedPaths = " in cmd_output:
cmd_output = process.stdout.read()
output_str = cmd_output.decode("utf-8")
if "DBGFileMappedPaths = " in output_str:
print("%s =>" % ' '.join(cmd))
print(cmd_output)
print(output_str)
print(
"Disable automatic lookup and caching of dSYMs before running the test suite!")
print("Exiting...")
Expand Down

0 comments on commit 53dddee

Please sign in to comment.