Merge "Generate 2.0 config for Mobly test." into main
This commit is contained in:
commit
a8de90ce4c
3 changed files with 6 additions and 9 deletions
|
@ -806,7 +806,7 @@ else
|
|||
ifneq (,$(test_config))
|
||||
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
|
||||
$(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \
|
||||
$(test_config):$(dir)/$(LOCAL_MODULE).config)))
|
||||
$(test_config):$(dir)/$(LOCAL_MODULE).config$(LOCAL_TEST_CONFIG_SUFFIX))))
|
||||
endif
|
||||
|
||||
ifneq (,$(LOCAL_EXTRA_FULL_TEST_CONFIGS))
|
||||
|
|
|
@ -291,6 +291,7 @@ LOCAL_STRIP_MODULE:=
|
|||
LOCAL_SYSTEM_SHARED_LIBRARIES:=none
|
||||
LOCAL_TARGET_REQUIRED_MODULES:=
|
||||
LOCAL_TEST_CONFIG:=
|
||||
LOCAL_TEST_CONFIG_SUFFIX:=
|
||||
LOCAL_TEST_DATA:=
|
||||
LOCAL_TEST_DATA_BINS:=
|
||||
LOCAL_TEST_MAINLINE_MODULES:=
|
||||
|
|
|
@ -13,13 +13,9 @@
|
|||
<configuration description="Config for {MODULE} mobly test">
|
||||
{EXTRA_CONFIGS}
|
||||
|
||||
<device name="device1"></device>
|
||||
<device name="device2"></device>
|
||||
<device name="AndroidRealDevice"></device>
|
||||
<device name="AndroidRealDevice"></device>
|
||||
|
||||
<test class="com.android.tradefed.testtype.mobly.MoblyBinaryHostTest">
|
||||
<!-- The mobly-par-file-name should match the module name -->
|
||||
<option name="mobly-par-file-name" value="{MODULE}" />
|
||||
<!-- Timeout limit in milliseconds for all test cases of the python binary -->
|
||||
<option name="mobly-test-timeout" value="300000" />
|
||||
</test>
|
||||
<option name="mobly_pkg" key="file" value="{MODULE}" />
|
||||
<test class="MoblyAospPackageTest" />
|
||||
</configuration>
|
||||
|
|
Loading…
Reference in a new issue