diff options
| author | Josh Gao <jmgao@google.com> | 2020-05-04 19:29:29 -0700 |
|---|---|---|
| committer | Josh Gao <jmgao@google.com> | 2020-05-05 14:44:01 -0700 |
| commit | a11d27f920f8e67a99b20322a985fe8bc625cfa5 (patch) | |
| tree | c633dbe22313a009171d1f32687bcb851e8e1f03 /adb/coverage/gen_coverage.sh | |
| parent | 3441f232abd69c6236de76ed794d645d1ee98752 (diff) | |
adb: use transport-id to make coverage script faster.
Test: ./coverage/gen_coverage.sh
Change-Id: I24e70952946ad91d51acf9bda386826e4e73a0d2
Diffstat (limited to 'adb/coverage/gen_coverage.sh')
| -rwxr-xr-x | adb/coverage/gen_coverage.sh | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/adb/coverage/gen_coverage.sh b/adb/coverage/gen_coverage.sh index cced62a292..3a5d1d22b5 100755 --- a/adb/coverage/gen_coverage.sh +++ b/adb/coverage/gen_coverage.sh @@ -17,10 +17,10 @@ LOCAL_SERIAL=$(adb shell getprop ro.serialno) # Check that we can connect to it. adb disconnect -adb tcpip $REMOTE_PORT -# TODO: Add `adb transport-id` and wait-for-offline on it. -sleep 5 +TRANSPORT_ID=$(adb transport-id) +adb tcpip $REMOTE_PORT +adb -t $TRANSPORT_ID wait-for-disconnect adb connect $REMOTE @@ -32,13 +32,16 @@ if [[ "$LOCAL_SERIAL" != "$REMOTE_FETCHED_SERIAL" ]]; then fi # Back to USB, and make sure adbd is root. +adb -s $REMOTE usb adb disconnect $REMOTE +adb wait-for-device root adb root -adb wait-for-device usb +adb wait-for-device -# TODO: Add `adb transport-id` and wait-for-offline on it. -sleep 5 +TRANSPORT_ID=$(adb transport-id) +adb usb +adb -t $TRANSPORT_ID wait-for-disconnect adb wait-for-device @@ -61,10 +64,9 @@ adb shell logcat -c -G128M adb shell setprop persist.adb.trace_mask 1 ### Run test_device.py over USB. +TRANSPORT_ID=$(adb transport-id) adb shell killall adbd - -# TODO: Add `adb transport-id` and wait-for-offline on it. -sleep 5 +adb -t $TRANSPORT_ID wait-for-disconnect adb wait-for-device shell rm -rf "/data/misc/trace/*" /data/local/tmp/adb_coverage/ "$OUTPUT_DIR"/../test_device.py @@ -80,8 +82,10 @@ echo Waiting for adbd to finish dumping traces sleep 5 # Restart adbd in tcp mode. +TRANSPORT_ID=$(adb transport-id) adb tcpip $REMOTE_PORT -sleep 5 +adb -t $TRANSPORT_ID wait-for-disconnect + adb connect $REMOTE adb -s $REMOTE wait-for-device |