StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Generate 2.0 config for Mobly test.

Browse Source 
- Add `v2` suffix for ATS 2.0 config.
- Update the mobly test config template.

Test: m CtsBluetoothMultiDevicesTestCases (with `runner = "mobly"`)
Bug: 299850687
Change-Id: Ic95ecb760989818291f0746054e4f68d12359a9f
This commit is contained in:
Ziwei Zhang
2024-02-01 11:01:54 +08:00
parent 7ba1e17dcc
commit 614a5aea0e
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/base_rules.mk
View File

@@ -806,7 +806,7 @@ else
ifneq (,$(test_config)) ifneq (,$(test_config))
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(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 endif
ifneq (,$(LOCAL_EXTRA_FULL_TEST_CONFIGS)) ifneq (,$(LOCAL_EXTRA_FULL_TEST_CONFIGS))

1
core/clear_vars.mk
View File

@@ -291,6 +291,7 @@ LOCAL_STRIP_MODULE:=
LOCAL_SYSTEM_SHARED_LIBRARIES:=none LOCAL_SYSTEM_SHARED_LIBRARIES:=none
LOCAL_TARGET_REQUIRED_MODULES:= LOCAL_TARGET_REQUIRED_MODULES:=
LOCAL_TEST_CONFIG:= LOCAL_TEST_CONFIG:=
LOCAL_TEST_CONFIG_SUFFIX:=
LOCAL_TEST_DATA:= LOCAL_TEST_DATA:=
LOCAL_TEST_DATA_BINS:= LOCAL_TEST_DATA_BINS:=
LOCAL_TEST_MAINLINE_MODULES:= LOCAL_TEST_MAINLINE_MODULES:=

12
core/python_binary_host_mobly_test_config_template.xml
View File

@@ -13,13 +13,9 @@
<configuration description="Config for {MODULE} mobly test"> <configuration description="Config for {MODULE} mobly test">
{EXTRA_CONFIGS} {EXTRA_CONFIGS}
<device name="device1"></device> <device name="AndroidRealDevice"></device>
<device name="device2"></device> <device name="AndroidRealDevice"></device>
<test class="com.android.tradefed.testtype.mobly.MoblyBinaryHostTest"> <option name="mobly_pkg" key="file" value="{MODULE}" />
<!-- The mobly-par-file-name should match the module name --> <test class="MoblyAospPackageTest" />
<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>
</configuration> </configuration>