Exit on error when build and run Android unit tests

Merged from Widevine CDM repo:
https://widevine-internal-review.googlesource.com/#/c/13200/

Change-Id: Ifd785a9b30293746f0ae0262b37f03bc905a5e09
This commit is contained in:
KongQun Yang
2015-02-25 15:49:03 -08:00
parent dff91b48c1
commit e3f668785e
2 changed files with 36 additions and 22 deletions

View File

@@ -1,5 +1,7 @@
#!/bin/sh
set -e
if [ -z "$ANDROID_BUILD_TOP" ]; then
echo "Android build environment not set"
exit -1
@@ -41,7 +43,7 @@ mm
cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/test/java/src/com/widevine/test
pwd
mm
mm WITH_DEXPREOPT=false
echo "waiting for device"
adb root && adb wait-for-device remount
@@ -57,14 +59,12 @@ adb push $OUT/system/bin/libwvdrmdrmplugin_test /system/bin
adb push $OUT/system/bin/cdm_engine_test /system/bin
adb push $OUT/system/bin/cdm_session_unittest /system/bin
adb push $OUT/system/bin/file_store_unittest /system/bin
adb push $OUT/system/bin/license_unittest /system/bin
adb push $OUT/system/bin/initialization_data_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
if [ -r $OUT/system/app/MediaDrmAPITest.apk ]; then
adb install -r $OUT/system/app/MediaDrmAPITest.apk
else
adb install -r $OUT/system/app/MediaDrmAPITest/MediaDrmAPITest.apk
fi
adb install -r $OUT/system/app/MediaDrmAPITest/MediaDrmAPITest.apk
cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine
./run_all_unit_tests.sh