Merge "Add test config for adbd_test and apply MainlineTestModuleController to it" into rvc-dev am: 8950624662

Change-Id: Iae50f577bb1233554a0d6a5101a30312f969b0f0
This commit is contained in:
Chen Zhu 2020-05-09 03:00:51 +00:00 committed by Automerger Merge Worker
commit 5b59f27e2c
2 changed files with 39 additions and 0 deletions

View file

@ -679,6 +679,8 @@ cc_test {
"mdns_test.cpp", "mdns_test.cpp",
], ],
test_config: "adb_test.xml",
shared_libs: [ shared_libs: [
"liblog", "liblog",
], ],

37
adb/adb_test.xml Normal file
View file

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2020 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- This test config file is auto-generated. -->
<configuration description="Runs adbd_test.">
<option name="test-suite-tag" value="apct" />
<option name="test-suite-tag" value="apct-native" />
<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="cleanup" value="true" />
<option name="push" value="adbd_test->/data/local/tmp/adbd_test" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest" >
<option name="native-test-device-path" value="/data/local/tmp" />
<option name="module-name" value="adbd_test" />
</test>
<object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
<option name="mainline-module-package-name" value="com.google.android.adbd" />
</object>
</configuration>