Use adb variable instead of direct command (#93293)

This commit is contained in:
Gary Qian 2021-11-08 21:37:48 -08:00 committed by GitHub
parent bfe9c59831
commit a61c57add6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -39,17 +39,18 @@ while read LOGLINE
do do
if [[ "${LOGLINE}" == *"Running deferred code"* ]]; then if [[ "${LOGLINE}" == *"Running deferred code"* ]]; then
echo "Found ${LOGLINE}" echo "Found ${LOGLINE}"
pkill -P $$
echo "All tests passed." echo "All tests passed."
pkill -P $$
exit 0 exit 0
fi fi
# Timeout if expected log not found # Timeout if expected log not found
current_time=$(date +%s) current_time=$(date +%s)
if [[ $((current_time - script_start_time_seconds)) -ge 150 ]]; then if [[ $((current_time - script_start_time_seconds)) -ge 150 ]]; then
echo "Failure: Deferred component did not load." echo "Failure: Deferred component did not load."
pkill -P $$
exit 1 exit 1
fi fi
done < <(adb logcat -T "$script_start_time") done < <($adb_path logcat -T "$script_start_time")
echo "Failure: Deferred component did not load." echo "Failure: Deferred component did not load."
exit 1 exit 1