LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix adb root invocations in script acov-llvm.py.

Browse Source 
Test: acov-llvm.py clean-device
Bug: 160401633
Change-Id: Ie41e13a7ab81994b8fed91ac07e32c6b90b91e74
This commit is contained in:
Roland Levillain
2021-05-13 16:19:45 +01:00
parent 37f061b11a
commit d203b9e692
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/acov-llvm.py
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# #
# Copyright (C) 202121 The Android Open Source Project # Copyright (C) 2021 The Android Open Source Project
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@@ -32,11 +32,11 @@
# or from all processes on the device: # or from all processes on the device:
# $ acov-llvm.py flush # $ acov-llvm.py flush
# #
# 4. pull coverage from device and generate coverage report # 4. Pull coverage from device and generate coverage report
# $ acov-llvm.py report -s <one-or-more-source-paths-in-$ANDROID_BUILD_TOP \ # $ acov-llvm.py report -s <one-or-more-source-paths-in-$ANDROID_BUILD_TOP \
# -b <one-or-more-binaries-in-$OUT> \ # -b <one-or-more-binaries-in-$OUT> \
# E.g.: # E.g.:
# development/scripts/acov-llvm.py report \ # acov-llvm.py report \
# -s bionic \ # -s bionic \
# -b \ # -b \
# $OUT/symbols/apex/com.android.runtime/lib/bionic/libc.so \ # $OUT/symbols/apex/com.android.runtime/lib/bionic/libc.so \
@@ -84,9 +84,19 @@ def check_output(cmd, *args, **kwargs):
cmd, *args, **kwargs, check=True, stdout=subprocess.PIPE).stdout cmd, *args, **kwargs, check=True, stdout=subprocess.PIPE).stdout
def adb(cmd, *args, **kwargs):
"""call 'adb <cmd>' with logging."""
return check_output(['adb'] + cmd, *args, **kwargs)
def adb_root(*args, **kwargs):
"""call 'adb root' with logging."""
return adb(['root'], *args, **kwargs)
def adb_shell(cmd, *args, **kwargs): def adb_shell(cmd, *args, **kwargs):
"""call 'adb shell <cmd>' with logging.""" """call 'adb shell <cmd>' with logging."""
return check_output(['adb', 'shell'] + cmd, *args, **kwargs) return adb(['shell'] + cmd, *args, **kwargs)
def send_flush_signal(pids=None): def send_flush_signal(pids=None):
@@ -123,7 +133,7 @@ def send_flush_signal(pids=None):
def do_clean_device(args): def do_clean_device(args):
adb_shell(['root']) adb_root()
logging.info('resetting coverage on device') logging.info('resetting coverage on device')
send_flush_signal() send_flush_signal()
@@ -137,7 +147,7 @@ def do_clean_device(args):
def do_flush(args): def do_flush(args):
adb_shell(['root']) adb_root()
if args.procnames: if args.procnames:
pids = adb_shell(['pidof'] + args.procnames, text=True).split() pids = adb_shell(['pidof'] + args.procnames, text=True).split()
@@ -154,7 +164,7 @@ def do_flush(args):
def do_report(args): def do_report(args):
adb_shell(['root']) adb_root()
temp_dir = tempfile.mkdtemp( temp_dir = tempfile.mkdtemp(
prefix='covreport-', dir=os.environ.get('ANDROID_BUILD_TOP', None)) prefix='covreport-', dir=os.environ.get('ANDROID_BUILD_TOP', None))