Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d90c32fb authored by Yifan Hong's avatar Yifan Hong
Browse files

Merge VtsFiemapWriterTest into fiemap_writer_test 

Delete AndroidTest.xml for VtsFiemapWriterTest and use auto-generated
test config for fiemap_writer_test.

Also add fiemap_writer_test to vts-core and device-tests.

Also require_root for fiemap_writer_test.

Test: atest fiemap_writer_test
Fixes: 144300653
Change-Id: Ifc3808ea56331809b58f0c02de2caac250d78352
parent 7cd37ba4

fs_mgr/libfiemap/Android.bp

+5 −4
Original line number Diff line number Diff line
@@ -78,6 +78,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 {
@@ -99,7 +104,3 @@ cc_test { 
        "image_test.cpp",

    ],

}
 


vts_config {

    name: "VtsFiemapWriterTest",

}

fs_mgr/libfiemap/AndroidTest.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<?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>