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

Commit 09b43036 authored by Luke Huang's avatar Luke Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix resolv_gold_test failure problem in MTS." into rvc-dev am: d5fb122b

Change-Id: If713718775a69936d28037e6f88c879d54e82ef2
parents 06f483fd d5fb122b
Loading
Loading
Loading
Loading
+4 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,10 @@ cc_test {
    name: "resolv_gold_test",
    name: "resolv_gold_test",
    test_suites: ["device-tests", "mts"],
    test_suites: ["device-tests", "mts"],
    require_root: true,
    require_root: true,
    // b/151392634, this is a workaround because MTS
    // can not handle the test with testdata correctly.
    // TODO: Remove the xml after MTS fixing the problem.
    test_config: "resolv_gold_test_config.xml",
    defaults: ["netd_defaults"],
    defaults: ["netd_defaults"],
    data: ["testdata/pb/*.pb"],
    data: ["testdata/pb/*.pb"],
    srcs: [
    srcs: [
+31 −0
Original line number Original line 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="Configuration for resolv gold tests">
   <option name="test-suite-tag" value="mts" />
   <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
       <option name="cleanup" value="true" />
       <option name="push" value="resolv_gold_test->/data/local/tmp/resolv_gold_test" />
       <option name="push" value="testdata->/data/local/tmp/testdata/" />
   </target_preparer>
   <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
   <test class="com.android.tradefed.testtype.GTest" >
       <option name="native-test-device-path" value="/data/local/tmp" />
       <option name="module-name" value="resolv_gold_test" />
       <option name="runtime-hint" value="10m" />
       <!-- test-timeout unit is ms, value = 10 min -->
       <option name="native-test-timeout" value="600000" />
   </test>
</configuration>