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

Commit 8d0c132a authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge changes from topic "liblp_test_static_rename" 

* changes:
  rename liblp_test_static to vts_kernel_liblp_test.
  Add liblp_test to presubmit.
parents 2f6d4eda 3a136e58

fs_mgr/liblp/Android.bp

+19 −9
Original line number Original line Diff line number Diff line
@@ -55,13 +55,14 @@ cc_library { 
    export_include_dirs: ["include"],

    export_include_dirs: ["include"],

}

}





cc_test {

cc_defaults {

    name: "liblp_test_static",

    name: "liblp_test_defaults",

    defaults: ["fs_mgr_defaults"],

    defaults: ["fs_mgr_defaults"],

    cppflags: [

    cppflags: [

        "-Wno-unused-parameter",

        "-Wno-unused-parameter",

    ],

    ],

    static_libs: [

    static_libs: [

        "libcutils",

        "libgmock",

        "libgmock",

        "libfs_mgr",

        "libfs_mgr",

        "liblp",

        "liblp",
@@ -74,11 +75,20 @@ cc_test { 
        "test_partition_opener.cpp",

        "test_partition_opener.cpp",

        "utility_test.cpp",

        "utility_test.cpp",

    ],

    ],

    target: {

}

        android: {



            static_libs: [

cc_test {

                "libcutils",

    name: "liblp_test",

    defaults: ["liblp_test_defaults"],

    test_config: "liblp_test.xml",

    test_suites: [

        "device-tests",

        "vts-core",

    ],

    ],

        },

    },

}

}



cc_test {

    name: "vts_kernel_liblp_test",

    defaults: ["liblp_test_defaults"],

}

fs_mgr/liblp/AndroidTest.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,8 +21,8 @@ 
    </target_preparer>

    </target_preparer>

    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">

    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">

      <option name="test-module-name" value="VtsKernelLiblpTest"/>

      <option name="test-module-name" value="VtsKernelLiblpTest"/>

        <option name="binary-test-source" value="_32bit::DATA/nativetest/liblp_test_static/liblp_test_static" />

        <option name="binary-test-source" value="_32bit::DATA/nativetest/vts_kernel_liblp_test/vts_kernel_liblp_test" />

        <option name="binary-test-source" value="_64bit::DATA/nativetest64/liblp_test_static/liblp_test_static" />

        <option name="binary-test-source" value="_64bit::DATA/nativetest64/vts_kernel_liblp_test/vts_kernel_liblp_test" />

        <option name="binary-test-type" value="gtest"/>

        <option name="binary-test-type" value="gtest"/>

        <option name="test-timeout" value="1m"/>

        <option name="test-timeout" value="1m"/>

        <option name="precondition-first-api-level" value="29" />

        <option name="precondition-first-api-level" value="29" />

fs_mgr/liblp/TEST_MAPPING

0 → 100644
+7 −0
Original line number Original line Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "liblp_test"

    }

  ]

}

fs_mgr/liblp/liblp_test.xml

0 → 100644
+27 −0
Original line number Original line 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 liblp_test">

    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

        <option name="cleanup" value="true" />

        <option name="push" value="liblp_test->/data/local/tmp/liblp_test" />

    </target_preparer>

    <option name="test-suite-tag" value="vts-core" />

    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="module-name" value="liblp_test" />

    </test>

</configuration>