TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-01 08:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

API 36 does not support wait_for_bootanim

Browse Source
This commit is contained in:
topjohnwu 2025-03-25 03:13:29 -07:00 committed by John Wu
parent b03fbb3917
commit e66fe8533e
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/avd_test.sh
View File

@ -21,20 +21,6 @@ cleanup() {
exit 1 exit 1
} }
wait_for_bootanim() {
set -e
adb wait-for-device
while true; do
local result="$(adb exec-out getprop init.svc.bootanim)"
if [ $? -ne 0 ]; then
exit 1
elif [ "$result" = "stopped" ]; then
break
fi
sleep 2
done
}
wait_for_boot() { wait_for_boot() {
set -e set -e
adb wait-for-device adb wait-for-device
@ -50,10 +36,9 @@ wait_for_boot() {
} }
wait_emu() { wait_emu() {
local wait_fn=$1
local which_pid local which_pid
timeout $boot_timeout bash -c $wait_fn & timeout $boot_timeout bash -c wait_for_boot &
local wait_pid=$! local wait_pid=$!
# Handle the case when emulator dies earlier than timeout # Handle the case when emulator dies earlier than timeout
@ -75,12 +60,12 @@ test_emu() {
fi fi
emu_pid=$! emu_pid=$!
wait_emu wait_for_boot wait_emu
run_setup $variant run_setup $variant
adb reboot adb reboot
wait_emu wait_for_boot wait_emu
run_tests run_tests
} }
@ -136,7 +121,7 @@ test_main() {
print_title "* Launching $avd_pkg" print_title "* Launching $avd_pkg"
"$emu" @test $emu_args >/dev/null 2>&1 & "$emu" @test $emu_args >/dev/null 2>&1 &
emu_pid=$! emu_pid=$!
wait_emu wait_for_bootanim wait_emu
# Update arguments for Magisk runs # Update arguments for Magisk runs
emu_args="$emu_args -ramdisk magisk_patched.img -feature -SystemAsRoot" emu_args="$emu_args -ramdisk magisk_patched.img -feature -SystemAsRoot"
@ -168,7 +153,6 @@ test_main() {
trap cleanup EXIT trap cleanup EXIT
export -f wait_for_boot export -f wait_for_boot
export -f wait_for_bootanim
case $(uname -m) in case $(uname -m) in
'arm64'|'aarch64') 'arm64'|'aarch64')