From 38cc7122fd9359bbda7428777d03bb51020e0c54 Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Wed, 11 Dec 2013 10:29:12 -0800 Subject: [PATCH] Improve unit test build script Make the build_and_run_all_unit_tests script push individual tests instead of doing a full sync, makes it easier to run unit tests against release builds. Merge of https://widevine-internal-review.googlesource.com/#/c/8405/ from the widevine cdm repo. Change-Id: I8efda77be9ab863f616fab88c4782b7c9edb8858 --- libwvdrmengine/build_and_run_all_unit_tests.sh | 16 ++++++++++++++++ libwvdrmengine/run_all_unit_tests.sh | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libwvdrmengine/build_and_run_all_unit_tests.sh b/libwvdrmengine/build_and_run_all_unit_tests.sh index c343cb17..b6ed9369 100755 --- a/libwvdrmengine/build_and_run_all_unit_tests.sh +++ b/libwvdrmengine/build_and_run_all_unit_tests.sh @@ -43,5 +43,21 @@ cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/test/java/src/com/widevine/ pwd mm +echo "waiting for device" +adb root && adb wait-for-device remount + + +adb push $OUT/system/bin/oemcrypto_test /system/bin +adb push $OUT/system/bin/request_license_test /system/bin +adb push $OUT/system/bin/policy_engine_unittest /system/bin +adb push $OUT/system/bin/libwvdrmmediacrypto_test /system/bin +adb push $OUT/system/bin/libwvdrmdrmplugin_test /system/bin +adb push $OUT/system/bin/cdm_engine_test /system/bin +adb push $OUT/system/bin/file_store_unittest /system/bin +adb push $OUT/system/bin/device_files_unittest /system/bin +adb push $OUT/system/bin/timer_unittest /system/bin +adb push $OUT/system/bin/libwvdrmengine_test /system/bin +adb install -r $OUT/system/app/MediaDrmAPITest.apk + cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine ./run_all_unit_tests.sh diff --git a/libwvdrmengine/run_all_unit_tests.sh b/libwvdrmengine/run_all_unit_tests.sh index fab07739..c015883b 100755 --- a/libwvdrmengine/run_all_unit_tests.sh +++ b/libwvdrmengine/run_all_unit_tests.sh @@ -6,7 +6,7 @@ if [ -z "$ANDROID_BUILD_TOP" ]; then fi echo "waiting for device" -adb root && adb wait-for-device remount && adb sync +adb root && adb wait-for-device remount adb shell /system/bin/oemcrypto_test adb shell /system/bin/request_license_test