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

Commit fb227081 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by android-build-merger
Browse files

Merge "[vts-core] add VtsHalAudioV6_0TargetTest to vts-core"

am: a64681e3

Change-Id: I9a936d4f59df7effa0ba15ad94856fff1f912061
parents 71e88328 a64681e3
Loading
Loading
Loading
Loading
+14 −4
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ cc_test {
        "-DMAJOR_VERSION=2",
        "-DMINOR_VERSION=0",
        "-include common/all-versions/VersionMacro.h",
    ]
    ],
}

cc_test {
@@ -64,7 +64,7 @@ cc_test {
        "-DMAJOR_VERSION=4",
        "-DMINOR_VERSION=0",
        "-include common/all-versions/VersionMacro.h",
    ]
    ],
}

cc_test {
@@ -81,7 +81,7 @@ cc_test {
        "-DMAJOR_VERSION=5",
        "-DMINOR_VERSION=0",
        "-include common/all-versions/VersionMacro.h",
    ]
    ],
}

cc_test {
@@ -98,5 +98,15 @@ cc_test {
        "-DMAJOR_VERSION=6",
        "-DMINOR_VERSION=0",
        "-include common/all-versions/VersionMacro.h",
    ]
    ],
    // Use test_config for vts-core suite.
    // TODO(b/146104851): Add auto-gen rules and remove it.
    test_config: "VtsHalAudioV6_0TargetTest.xml",
    data: [
        ":audio_policy_configuration_V6_0",
    ],
    test_suites: [
        "general-tests",
        "vts-core",
    ],
}
+40 −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 VtsHalAudioV6_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.RunCommandTargetPreparer">
        <option name="run-command" value="stop"/>
        <option name="run-command" value="setprop vts.native_server.on 1"/>
        <option name="teardown-command" value="start"/>
        <option name="teardown-command" value="setprop vts.native_server.on 0"/>
    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
        <option name="cleanup" value="true" />
        <option name="push" value="VtsHalAudioV6_0TargetTest->/data/local/tmp/VtsHalAudioV6_0TargetTest" />
        <option name="push" value="audio_policy_configuration_V6_0.xsd->/data/local/tmp/audio_policy_configuration_V6_0.xsd" />
    </target_preparer>

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