Update unit tests to build into /data/bin
Tradefed needs these tests to be in the /DATA directory.
Test: cd vendor/widevine && ./build_and_run_all_unit_tests
All tests should build and pass.
make tests
unzip android-tests.zip and verify all tests located in DATA/bin
Bug: 62055647
Change-Id: I35925e29558561c4726bb2249499bfee4e54cf45
This commit is contained in:
@@ -47,7 +47,7 @@ mm -j $NUM_CORES || mma -j $NUM_CORES
|
||||
|
||||
# Detect the device and check if Verity is going to stop the script from working
|
||||
echo "waiting for device"
|
||||
ADB_OUTPUT=`adb root && adb wait-for-device remount`
|
||||
ADB_OUTPUT=`adb root && echo ". " && adb wait-for-device remount`
|
||||
echo $ADB_OUTPUT
|
||||
if echo $ADB_OUTPUT | grep -qi "verity"; then
|
||||
echo
|
||||
@@ -59,43 +59,49 @@ fi
|
||||
|
||||
# Push the files to the device
|
||||
|
||||
# Given a local path to a file, this will first try to push it to /vendor/bin
|
||||
# and then, if that fails, to /data/widevine_tests.
|
||||
# Given a local path to a file, this will try to push it to /data/bin.
|
||||
# If that fails, an error message will be printed.
|
||||
try_adb_push() {
|
||||
# Swallow the error message -- assume it is a read-only file system.
|
||||
if ! adb push $@ /vendor/bin &> /dev/null; then
|
||||
adb shell mkdir -p /data/widevine_tests
|
||||
# If this fails, the user will get the error message.
|
||||
adb push $@ /data/widevine_tests
|
||||
# android-tests.zip requires /data/bin, we should use the same
|
||||
if [ -f $OUT/data/bin/$1 ]; then
|
||||
test_file=$OUT/data/bin/$1
|
||||
else
|
||||
echo "I cannot find $1"
|
||||
echo "I think it should be in $OUT/data/bin"
|
||||
exit 1
|
||||
fi
|
||||
adb shell mkdir -p /data/bin
|
||||
adb push $test_file /data/bin/$1
|
||||
}
|
||||
|
||||
# Push the tests to the device
|
||||
try_adb_push $OUT/vendor/bin/oemcrypto_test
|
||||
try_adb_push $OUT/vendor/bin/request_license_test
|
||||
try_adb_push $OUT/vendor/bin/cdm_extended_duration_test
|
||||
try_adb_push $OUT/vendor/bin/policy_engine_unittest
|
||||
try_adb_push $OUT/vendor/bin/policy_engine_constraints_unittest
|
||||
try_adb_push $OUT/vendor/bin/libwvdrmmediacrypto_test
|
||||
try_adb_push $OUT/vendor/bin/libwvdrmmediacrypto_hidl_test
|
||||
try_adb_push $OUT/vendor/bin/libwvdrmdrmplugin_test
|
||||
try_adb_push $OUT/vendor/bin/libwvdrmdrmplugin_hidl_test
|
||||
try_adb_push $OUT/vendor/bin/cdm_engine_test
|
||||
try_adb_push $OUT/vendor/bin/cdm_session_unittest
|
||||
try_adb_push $OUT/vendor/bin/file_store_unittest
|
||||
try_adb_push $OUT/vendor/bin/file_utils_unittest
|
||||
try_adb_push $OUT/vendor/bin/license_unittest
|
||||
try_adb_push $OUT/vendor/bin/license_keys_unittest
|
||||
try_adb_push $OUT/vendor/bin/initialization_data_unittest
|
||||
try_adb_push $OUT/vendor/bin/device_files_unittest
|
||||
try_adb_push $OUT/vendor/bin/usage_table_header_unittest
|
||||
try_adb_push $OUT/vendor/bin/service_certificate_unittest
|
||||
try_adb_push $OUT/vendor/bin/timer_unittest
|
||||
try_adb_push $OUT/vendor/bin/libwvdrmengine_test
|
||||
try_adb_push $OUT/vendor/bin/libwvdrmengine_hidl_test
|
||||
try_adb_push $OUT/vendor/bin/buffer_reader_test
|
||||
try_adb_push $OUT/vendor/bin/distribution_test
|
||||
try_adb_push $OUT/vendor/bin/event_metric_test
|
||||
try_adb_push base64_test
|
||||
try_adb_push buffer_reader_test
|
||||
try_adb_push cdm_engine_test
|
||||
try_adb_push cdm_extended_duration_test
|
||||
try_adb_push cdm_session_unittest
|
||||
try_adb_push device_files_unittest
|
||||
try_adb_push distribution_test
|
||||
try_adb_push event_metric_test
|
||||
try_adb_push file_store_unittest
|
||||
try_adb_push file_utils_unittest
|
||||
try_adb_push http_socket_test
|
||||
try_adb_push initialization_data_unittest
|
||||
try_adb_push libwvdrmdrmplugin_hidl_test
|
||||
try_adb_push libwvdrmdrmplugin_test
|
||||
try_adb_push libwvdrmengine_hidl_test
|
||||
try_adb_push libwvdrmengine_test
|
||||
try_adb_push libwvdrmmediacrypto_hidl_test
|
||||
try_adb_push libwvdrmmediacrypto_test
|
||||
try_adb_push license_keys_unittest
|
||||
try_adb_push license_unittest
|
||||
try_adb_push oemcrypto_test
|
||||
try_adb_push policy_engine_constraints_unittest
|
||||
try_adb_push policy_engine_unittest
|
||||
try_adb_push request_license_test
|
||||
try_adb_push service_certificate_unittest
|
||||
try_adb_push timer_unittest
|
||||
try_adb_push usage_table_header_unittest
|
||||
|
||||
# Run the tests using run_all_unit_tests.sh
|
||||
cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine
|
||||
|
||||
Reference in New Issue
Block a user