Merge "Now ignoring adb shell service return error code in acov-llvm.py" am: 1c18adc4e1
Original change: https://android-review.googlesource.com/c/platform/development/+/2328192 Change-Id: I68ab77dcce1349de8dee3c18bdf2b5e020e8252e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
4c47b7fd89
@@ -125,7 +125,15 @@ def send_flush_signal(pids=None):
|
||||
logging.warning(
|
||||
f'couldn\'t find any process with handler for signal 37')
|
||||
|
||||
adb_shell(['kill', '-37'] + pids)
|
||||
# Some processes may have exited after we run `ps` command above - ignore failures when
|
||||
# sending flush signal.
|
||||
# We rely on kill(1) sending the signal to all pids on the command line even if some don't
|
||||
# exist. This is true of toybox and "probably implied" by POSIX, even if not explicitly called
|
||||
# out [https://pubs.opengroup.org/onlinepubs/9699919799/utilities/kill.html].
|
||||
try:
|
||||
adb_shell(['kill', '-37'] + pids)
|
||||
except subprocess.CalledProcessError:
|
||||
logging.warning('Sending flush signal failed - some pids no longer active')
|
||||
|
||||
|
||||
def do_clean_device(args):
|
||||
|
||||
Reference in New Issue
Block a user