Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-01-05 23:52:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[libc++] Add a --verbose option to ssh.py to help debug failures

Browse Source
This commit is contained in:
Louis Dionne 2023-09-21 13:31:32 -04:00
parent ededcb0041
commit 77d8ce5bb8
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libcxx/utils/ssh.py
View File

@ -39,6 +39,8 @@ def scp(args, src, dst):
cmd.extend(shlex.split(args.extra_scp_args)) cmd.extend(shlex.split(args.extra_scp_args))
return cmd + [src, "{}:{}".format(args.host, dst)] return cmd + [src, "{}:{}".format(args.host, dst)]
def runCommand(command, *args, **kwargs):
return subprocess.run(command, *args, **kwargs)
def main(): def main():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
@ -49,19 +51,25 @@ def main():
parser.add_argument("--extra-scp-args", type=str, required=False) parser.add_argument("--extra-scp-args", type=str, required=False)
parser.add_argument("--codesign_identity", type=str, required=False, default=None) parser.add_argument("--codesign_identity", type=str, required=False, default=None)
parser.add_argument("--env", type=str, nargs="*", required=False, default=[]) parser.add_argument("--env", type=str, nargs="*", required=False, default=[])
parser.add_argument( parser.add_argument("--prepend_env", type=str, nargs="*", required=False, default=[])
"--prepend_env", type=str, nargs="*", required=False, default=[] parser.add_argument("-v", "--verbose", action='store_true')
)
parser.add_argument("command", nargs=argparse.ONE_OR_MORE) parser.add_argument("command", nargs=argparse.ONE_OR_MORE)
args = parser.parse_args() args = parser.parse_args()
commandLine = args.command commandLine = args.command
def runCommand(command, *args_, **kwargs):
if args.verbose:
print(f"$ {' '.join(command)}")
return subprocess.run(command, *args_, **kwargs)
# Create a temporary directory where the test will be run. # Create a temporary directory where the test will be run.
# That is effectively the value of %T on the remote host. # That is effectively the value of %T on the remote host.
tmp = subprocess.check_output( tmp = runCommand(
ssh(args, "mktemp -d {}/libcxx.XXXXXXXXXX".format(args.tempdir)), ssh(args, "mktemp -d {}/libcxx.XXXXXXXXXX".format(args.tempdir)),
universal_newlines=True, universal_newlines=True,
).strip() check=True,
capture_output=True
).stdout.strip()
# HACK: # HACK:
# If an argument is a file that ends in `.tmp.exe`, assume it is the name # If an argument is a file that ends in `.tmp.exe`, assume it is the name
@ -77,10 +85,8 @@ def main():
# Do any necessary codesigning of test-executables found in the command line. # Do any necessary codesigning of test-executables found in the command line.
if args.codesign_identity: if args.codesign_identity:
for exe in filter(isTestExe, commandLine): for exe in filter(isTestExe, commandLine):
subprocess.check_call( codesign = ["xcrun", "codesign", "-f", "-s", args.codesign_identity, exe]
["xcrun", "codesign", "-f", "-s", args.codesign_identity, exe], runCommand(codesign, env={}, check=True)
env={},
)
# tar up the execution directory (which contains everything that's needed # tar up the execution directory (which contains everything that's needed
# to run the test), and copy the tarball over to the remote host. # to run the test), and copy the tarball over to the remote host.
@ -93,7 +99,7 @@ def main():
# the temporary file while still open doesn't work on Windows. # the temporary file while still open doesn't work on Windows.
tmpTar.close() tmpTar.close()
remoteTarball = pathOnRemote(tmpTar.name) remoteTarball = pathOnRemote(tmpTar.name)
subprocess.check_call(scp(args, tmpTar.name, remoteTarball)) runCommand(scp(args, tmpTar.name, remoteTarball), check=True)
finally: finally:
# Make sure we close the file in case an exception happens before # Make sure we close the file in case an exception happens before
# we've closed it above -- otherwise close() is idempotent. # we've closed it above -- otherwise close() is idempotent.
@ -130,12 +136,12 @@ def main():
remoteCommands.append(subprocess.list2cmdline(commandLine)) remoteCommands.append(subprocess.list2cmdline(commandLine))
# Finally, SSH to the remote host and execute all the commands. # Finally, SSH to the remote host and execute all the commands.
rc = subprocess.call(ssh(args, " && ".join(remoteCommands))) rc = runCommand(ssh(args, " && ".join(remoteCommands))).returncode
return rc return rc
finally: finally:
# Make sure the temporary directory is removed when we're done. # Make sure the temporary directory is removed when we're done.
subprocess.check_call(ssh(args, "rm -r {}".format(tmp))) runCommand(ssh(args, "rm -r {}".format(tmp)), check=True)
if __name__ == "__main__": if __name__ == "__main__":