[compiler-rt][NFC] add debugging options to iossim_run

[aralisza]

Summary

Add the ability to:

1. tell simctl to wait for debugger when spawning process
2. print the command that is called to launch the process

[aralisza]

compiler-rt/test/lit.common.cfg.py

700

just some whitespace cleanup

[delcypher]

If you can address the comments then LGTM.

compiler-rt/test/lit.common.cfg.py

700

Can you land the whitespace change as a separate patch? The whitespace change is fine so no need to do a review on Phabricator.

The only reason I ask is it's good to keep commits to be single purpose so that if a revert needs to happen it doesn't also revert unrelated things.

compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py

39

Could you update the bin/rm path to also print what it's doing when iossim_run_verbose is true?

[aralisza]

also print for rm

[delcypher]

LGTM

compiler-rt/test/lit.common.cfg.py

if append_target_cflags:
   lit_config.note('Appending to extra_cflags: "{}"'.format(append_target_cflags))
   extra_cflags += [append_target_cflags]
 
 config.clang = " " + " ".join(run_wrapper + [config.compile_wrapper, config.clang]) + " "
 config.target_cflags = " " + " ".join(target_cflags + extra_cflags) + " "
 
 if config.host_os == 'Darwin':
   config.substitutions.append((
-    "%get_pid_from_output", 
+    "%get_pid_from_output",
     "{} {}/get_pid_from_output.py".format(
-      sh_quote(config.python_executable), 
+      sh_quote(config.python_executable),
       sh_quote(get_ios_commands_dir())
     ))
   )
   config.substitutions.append(
-    ("%print_crashreport_for_pid", 
+    ("%print_crashreport_for_pid",
     "{} {}/print_crashreport_for_pid.py".format(
-      sh_quote(config.python_executable), 
+      sh_quote(config.python_executable),
       sh_quote(get_ios_commands_dir())
     ))
   )

compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py

 #!/usr/bin/env python3
 
 import glob, os, pipes, sys, subprocess
 
 
 device_id = os.environ.get('SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER')
+iossim_run_verbose = os.environ.get('SANITIZER_IOSSIM_RUN_VERBOSE')
+wait_for_debug = os.environ.get('SANITIZER_IOSSIM_RUN_WAIT_FOR_DEBUGGER')
+
 if not device_id:
   raise EnvironmentError("Specify SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER to select which simulator to use.")
 
 for e in [
   "ASAN_OPTIONS",
   "TSAN_OPTIONS",
   "UBSAN_OPTIONS",
   "APPLE_ASAN_INIT_FOR_DLOPEN",
for arg in sys.argv[2:]:
     if '*' in arg or '?' in arg:
       # Don't quote glob pattern
       rm_args.append(arg)
     else:
       # FIXME(dliew): pipes.quote() is deprecated
       rm_args.append(pipes.quote(arg))
   rm_cmd_line = ["/bin/rm"] + rm_args
   rm_cmd_line_str = ' '.join(rm_cmd_line)
   # We use `shell=True` so that any wildcard globs get expanded by the shell.
   exitcode = subprocess.call(rm_cmd_line_str, shell=True)
 else:
-  exitcode = subprocess.call(["xcrun", "simctl", "spawn", "--standalone", device_id] + sys.argv[1:])
+  cmd = ["xcrun", "simctl", "spawn", "--standalone"]
+
+  if wait_for_debug:
+    cmd.append("--wait-for-debugger")
+
+  cmd.append(device_id)
+  cmd += sys.argv[1:]
+
+  if iossim_run_verbose:
+    print("RUNNING: \t{}".format(" ".join(cmd)))
+
+  exitcode = subprocess.call(cmd)
 if exitcode > 125:
   exitcode = 126
 sys.exit(exitcode)