mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Auto merge of #11771 - jdm:osx_gdb, r=Wafflespeanut
Pass Ctr+C to underlying process when invoking commands through mach. This is based on the patch in https://bugzilla.mozilla.org/show_bug.cgi?id=996823 and the [suprocess.check_call documentation](https://docs.python.org/2/library/subprocess.html#subprocess.check_call). --- - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #11770 (github issue number if applicable). - [X] These changes do not require tests because we can't test the mach subprocess invocation <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11771) <!-- Reviewable:end -->
This commit is contained in:
commit
f029e1a5cd
1 changed files with 14 additions and 1 deletions
|
@ -102,7 +102,20 @@ def check_call(*args, **kwargs):
|
||||||
print(' '.join(args[0]))
|
print(' '.join(args[0]))
|
||||||
# we have to use shell=True in order to get PATH handling
|
# we have to use shell=True in order to get PATH handling
|
||||||
# when looking for the binary on Windows
|
# when looking for the binary on Windows
|
||||||
return subprocess.check_call(*args, shell=sys.platform == 'win32', **kwargs)
|
proc = subprocess.Popen(*args, shell=sys.platform == 'win32', **kwargs)
|
||||||
|
status = None
|
||||||
|
# Leave it to the subprocess to handle Ctrl+C. If it terminates as
|
||||||
|
# a result of Ctrl+C, proc.wait() will return a status code, and,
|
||||||
|
# we get out of the loop. If it doesn't, like e.g. gdb, we continue
|
||||||
|
# waiting.
|
||||||
|
while status is None:
|
||||||
|
try:
|
||||||
|
status = proc.wait()
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
pass
|
||||||
|
|
||||||
|
if status:
|
||||||
|
raise subprocess.CalledProcessError(status, ' '.join(*args))
|
||||||
|
|
||||||
|
|
||||||
def is_windows():
|
def is_windows():
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue