widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Run unit tests if verity has already been disabled" into main

Browse Source
This commit is contained in:
Rahul Frias
2024-03-08 22:30:45 +00:00
committed by Android (Google) Code Review
parent 925b52e133 b0203576c4
commit e7a96ec47a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/build_all_unit_tests.sh
View File

@@ -84,7 +84,7 @@ m -j $NUM_CORES $WV_UNITTESTS
echo "waiting for device" echo "waiting for device"
ADB_OUTPUT=`adb $SERIAL_NUM root && echo ". " && adb $SERIAL_NUM wait-for-device remount` ADB_OUTPUT=`adb $SERIAL_NUM root && echo ". " && adb $SERIAL_NUM wait-for-device remount`
echo $ADB_OUTPUT echo $ADB_OUTPUT
if echo $ADB_OUTPUT | grep -qi "verity"; then if echo $ADB_OUTPUT | grep -qi "verity" | grep -vi "Verity is already disabled"; then
echo echo
echo "ERROR: This device has Verity enabled. build_and_run_all_unit_tests.sh " echo "ERROR: This device has Verity enabled. build_and_run_all_unit_tests.sh "
echo "does not work if Verity is enabled. Please disable Verity with" echo "does not work if Verity is enabled. Please disable Verity with"

2
libwvdrmengine/run_all_unit_tests.sh
View File

@@ -68,7 +68,7 @@ fi
echo "waiting for device" echo "waiting for device"
ADB_OUTPUT=`adb $SERIAL_NUM root && echo ". " && adb $SERIAL_NUM wait-for-device remount` ADB_OUTPUT=`adb $SERIAL_NUM root && echo ". " && adb $SERIAL_NUM wait-for-device remount`
echo $ADB_OUTPUT echo $ADB_OUTPUT
if echo $ADB_OUTPUT | grep -qi "verity"; then if echo $ADB_OUTPUT | grep -qi "verity" | grep -vi "Verity is already disabled"; then
echo echo
echo "ERROR: This device has Verity enabled. run_all_unit_tests.sh does not " echo "ERROR: This device has Verity enabled. run_all_unit_tests.sh does not "
echo "work if Verity is enabled. Please disable Verity with" echo "work if Verity is enabled. Please disable Verity with"