Update build_and_run script
Merge from Widevine repo of http://go/wvgerrit/73024 This updates the build_and_run_all_unit_tests.sh to only build a predefined list of tests. This prevents the accidental inclusion of android.hardware.drm@1.2-service-lazy.widevine.rc. Bug: b/123885511 Test: Unit tests build and extra library does not. Change-Id: I4368817103720976de2b21de2591a0712944c8d0
This commit is contained in:
@@ -26,29 +26,49 @@ done
|
||||
. $ANDROID_BUILD_TOP/build/envsetup.sh
|
||||
|
||||
# Build all the targets
|
||||
cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine
|
||||
pwd
|
||||
mm -j $NUM_CORES || mma -j $NUM_CORES
|
||||
# This list is slightly longer than the one in run_all_unit_tests.sh because
|
||||
# it does not run very long tests or tests needing special setup.
|
||||
WV_TEST_TARGETS="base64_test \
|
||||
buffer_reader_test \
|
||||
cdm_engine_test \
|
||||
cdm_engine_metrics_decorator_unittest \
|
||||
cdm_feature_test \
|
||||
cdm_extended_duration_test \
|
||||
cdm_session_unittest \
|
||||
counter_metric_unittest \
|
||||
crypto_session_unittest \
|
||||
device_files_unittest \
|
||||
distribution_unittest \
|
||||
event_metric_unittest \
|
||||
file_store_unittest \
|
||||
file_utils_unittest \
|
||||
generic_crypto_unittest \
|
||||
hidl_metrics_adapter_unittest \
|
||||
http_socket_test \
|
||||
initialization_data_unittest \
|
||||
libwvdrmdrmplugin_hidl_test \
|
||||
libwvdrmdrmplugin_test \
|
||||
libwvdrmengine_hidl_test \
|
||||
libwvdrmengine_test \
|
||||
libwvdrmmediacrypto_hidl_test \
|
||||
libwvdrmmediacrypto_test \
|
||||
license_keys_unittest \
|
||||
license_unittest \
|
||||
oemcrypto_test \
|
||||
policy_engine_constraints_unittest \
|
||||
policy_engine_unittest \
|
||||
request_license_test \
|
||||
rw_lock_test \
|
||||
service_certificate_unittest \
|
||||
timer_unittest \
|
||||
usage_table_header_unittest \
|
||||
value_metric_unittest \
|
||||
wv_cdm_metrics_test"
|
||||
|
||||
cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/test/unit
|
||||
cd $ANDROID_BUILD_TOP
|
||||
pwd
|
||||
mm -j $NUM_CORES || mma -j $NUM_CORES
|
||||
m -j $NUM_CORES $WV_TEST_TARGETS
|
||||
|
||||
cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/cdm/test
|
||||
pwd
|
||||
mm -j $NUM_CORES || mma -j $NUM_CORES
|
||||
|
||||
cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/mediacrypto/test
|
||||
pwd
|
||||
mm -j $NUM_CORES || mma -j $NUM_CORES
|
||||
|
||||
cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/mediadrm/test
|
||||
pwd
|
||||
mm -j $NUM_CORES || mma -j $NUM_CORES
|
||||
|
||||
cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/oemcrypto/test
|
||||
pwd
|
||||
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"
|
||||
@@ -80,42 +100,9 @@ try_adb_push() {
|
||||
}
|
||||
|
||||
# Push the tests to the device
|
||||
try_adb_push base64_test
|
||||
try_adb_push buffer_reader_test
|
||||
try_adb_push cdm_engine_test
|
||||
try_adb_push cdm_engine_metrics_decorator_unittest
|
||||
try_adb_push cdm_feature_test
|
||||
try_adb_push cdm_extended_duration_test
|
||||
try_adb_push cdm_session_unittest
|
||||
try_adb_push counter_metric_unittest
|
||||
try_adb_push crypto_session_unittest
|
||||
try_adb_push device_files_unittest
|
||||
try_adb_push distribution_unittest
|
||||
try_adb_push event_metric_unittest
|
||||
try_adb_push file_store_unittest
|
||||
try_adb_push file_utils_unittest
|
||||
try_adb_push generic_crypto_unittest
|
||||
try_adb_push hidl_metrics_adapter_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 rw_lock_test
|
||||
try_adb_push service_certificate_unittest
|
||||
try_adb_push timer_unittest
|
||||
try_adb_push usage_table_header_unittest
|
||||
try_adb_push value_metric_unittest
|
||||
try_adb_push wv_cdm_metrics_test
|
||||
for f in $WV_TEST_TARGETS; do
|
||||
try_adb_push $f
|
||||
done
|
||||
|
||||
# Run the tests using run_all_unit_tests.sh
|
||||
cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine
|
||||
|
||||
Reference in New Issue
Block a user