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

Commit 7315bc91 authored by nelsonli's avatar nelsonli Committed by android-build-merger
Browse files

Merge "[vts-core] Make VtsKernelLibcutilsTest runnable by base TradeFed"

am: 0852b10b

Change-Id: Idd1430e83e46f21346599a53897ebdcffdd7a961
parents f29bb3a0 0852b10b
Loading
Loading
Loading
Loading
+15 −3
Original line number Diff line number Diff line
@@ -250,9 +250,8 @@ cc_test {
    require_root: true,
}

cc_test {
    name: "libcutils_test_static",
    test_suites: ["device-tests"],
cc_defaults {
    name: "libcutils_test_static_defaults",
    defaults: ["libcutils_test_default"],
    static_libs: [
        "libc",
@@ -272,3 +271,16 @@ cc_test {
        },
    },
}

cc_test {
    name: "libcutils_test_static",
    test_suites: ["device-tests"],
    defaults: ["libcutils_test_static_defaults"],
}

cc_test {
    name: "KernelLibcutilsTest",
    test_suites: ["general-tests", "vts-core"],
    defaults: ["libcutils_test_static_defaults"],
    test_config: "KernelLibcutilsTest.xml",
}
+33 −0
Original line number Diff line number Diff line
<?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 libcutils_test_static.">
    <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="libcutils_test_static->/data/local/tmp/libcutils_test_static" />
    </target_preparer>

    <test class="com.android.tradefed.testtype.GTest" >
        <option name="native-test-device-path" value="/data/local/tmp" />
        <option name="module-name" value="libcutils_test_static" />
        <option name="include-filter" value="*AshmemTest*" />
    </test>
</configuration>