Merge "OEMCrypto Unit Tests"

This commit is contained in:
Fred Gylys-Colwell
2015-04-10 00:06:38 +00:00
committed by Android (Google) Code Review
10 changed files with 129 additions and 73 deletions

View File

@@ -7,7 +7,7 @@ failed_tests=()
adb_shell_run() {
local tmp_log="$OUT/mediadrmtest.log"
local adb_error="[ADB SHELL] $@ failed"
adb shell $@ \|\| echo "$adb_error" | tee "$tmp_log"
adb shell GTEST_FILTER=$GTEST_FILTER $@ \|\| echo "$adb_error" | tee "$tmp_log"
! grep -Fq "$adb_error" "$tmp_log"
local result=$?
if [ $result -ne 0 ]; then
@@ -24,6 +24,7 @@ fi
echo "waiting for device"
adb root && adb wait-for-device remount
adb_shell_run FORCE_LEVEL3_OEMCRYPTO=yes /system/bin/oemcrypto_test
adb_shell_run /system/bin/oemcrypto_test
adb_shell_run /system/bin/request_license_test
# cdm_extended_duration_test takes >30 minutes to run.