Merge "Use DeviceFeatureModuleController to run tests only if the device has the required feature." into main
This commit is contained in:
commit
4dd381a966
3 changed files with 15 additions and 0 deletions
|
|
@ -38,6 +38,11 @@
|
|||
<option name="mainline-module-package-name" value="com.google.android.tethering" />
|
||||
</object>
|
||||
|
||||
<object type="module_controller"
|
||||
class="com.android.tradefed.testtype.suite.module.DeviceFeatureModuleController">
|
||||
<option name="required-feature" value="android.hardware.thread_network" />
|
||||
</object>
|
||||
|
||||
<!-- Install test -->
|
||||
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
|
||||
<option name="test-file-name" value="CtsThreadNetworkTestCases.apk" />
|
||||
|
|
|
|||
|
|
@ -31,6 +31,11 @@
|
|||
<option name="mainline-module-package-name" value="com.google.android.tethering" />
|
||||
</object>
|
||||
|
||||
<object type="module_controller"
|
||||
class="com.android.tradefed.testtype.suite.module.DeviceFeatureModuleController">
|
||||
<option name="required-feature" value="android.hardware.thread_network" />
|
||||
</object>
|
||||
|
||||
<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
|
||||
|
||||
<!-- Install test -->
|
||||
|
|
|
|||
|
|
@ -31,6 +31,11 @@
|
|||
<option name="mainline-module-package-name" value="com.google.android.tethering" />
|
||||
</object>
|
||||
|
||||
<object type="module_controller"
|
||||
class="com.android.tradefed.testtype.suite.module.DeviceFeatureModuleController">
|
||||
<option name="required-feature" value="android.hardware.thread_network" />
|
||||
</object>
|
||||
|
||||
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
|
||||
<option name="test-file-name" value="ThreadNetworkUnitTests.apk" />
|
||||
<option name="check-min-sdk" value="true" />
|
||||
|
|
|
|||
Loading…
Reference in a new issue