Merge "Fix health.storage test" am: 5adcaebd8c am: 2b59db2ca7

Change-Id: I9e318844e2c78e80d9fe7e0a53b1ca6f751758de
This commit is contained in:
Automerger Merge Worker 2020-02-09 04:10:41 +00:00
commit d4cd7c3769
2 changed files with 38 additions and 2 deletions

View file

@ -22,6 +22,9 @@ cc_test {
shared_libs: [ shared_libs: [
"libhidlbase", "libhidlbase",
], ],
test_suites: ["general-tests", "vts-core"], test_suites: [
"general-tests",
"vts-core",
],
test_config: "VtsHalHealthStorageV1_0TargetTest.config",
} }

View file

@ -0,0 +1,33 @@
<?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.
-->
<configuration description="Runs VtsHalHealthStorageV1_0TargetTest.">
<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="VtsHalHealthStorageV1_0TargetTest->/data/local/tmp/VtsHalHealthStorageV1_0TargetTest" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest" >
<option name="native-test-device-path" value="/data/local/tmp" />
<option name="module-name" value="VtsHalHealthStorageV1_0TargetTest" />
<option name="native-test-timeout" value="3m" />
</test>
</configuration>