openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Merge VtsFiemapWriterTest into fiemap_writer_test" 

am: b5c0ad7b21

Change-Id: I3de63df53c7808844fef6844ab25b9ab81d34ff5
This commit is contained in:
Yifan Hong 2020-01-13 16:23:57 -08:00 committed by android-build-merger
parent bac044210e b5c0ad7b21
commit d4f2250049
2 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs_mgr/libfiemap/Android.bp
View File

@ -79,6 +79,11 @@ cc_test {
srcs: [
"fiemap_writer_test.cpp",
],
test_suites: ["vts-core", "device-tests"],
auto_gen_config: true,
test_min_api_level: 29,
require_root: true,
}
cc_test {
@ -100,7 +105,3 @@ cc_test {
"image_test.cpp",
],
}
vts_config {
name: "VtsFiemapWriterTest",
}

30
fs_mgr/libfiemap/AndroidTest.xml
View File

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 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="Config for VTS VtsFiemapWriterTest">
<option name="config-descriptor:metadata" key="plan" value="vts-kernel" />
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="abort-on-push-failure" value="false"/>
<option name="push-group" value="HostDrivenTest.push"/>
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsFiemapWriterTest"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/fiemap_writer_test/fiemap_writer_test" />
<option name="binary-test-source" value="_64bit::DATA/nativetest64/fiemap_writer_test/fiemap_writer_test" />
<option name="binary-test-type" value="gtest"/>
<option name="precondition-first-api-level" value="29" />
<option name="test-timeout" value="1m"/>
</test>
</configuration>