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

Commit 3c86c313 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Fix the multi arch issue of resolv_unit_test. am: 9d7f160e am: 06f483fd am: 63571e37

Change-Id: I30d9cbcb12aa3e84a9c588bf93a1d6f56a432491
parents 1de4a179 63571e37
Loading
Loading
Loading
Loading
+1 −10
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ cc_test {
    name: "resolv_unit_test",
    test_suites: ["device-tests", "mts"],
    require_root: true,
    test_config: "resolv_unit_test_config.xml",
    //TODO:  drop root privileges and make it be an real unit test.
    defaults: ["netd_defaults"],
    srcs: [
@@ -216,13 +215,5 @@ cc_test {
        "server_configurable_flags",
        "stats_proto",
    ],
    compile_multilib: "both",
    multilib: {
        lib32: {
            suffix: "32",
        },
        lib64: {
            suffix: "64",
        },
    },
    compile_multilib: "first",
}

resolv_unit_test_config.xml

deleted100644 → 0
+0 −31
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="Configuration for resolv unit tests">
   <option name="test-suite-tag" value="mts" />
   <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
       <option name="cleanup" value="true" />
       <option name="push" value="resolv_unit_test->/data/local/tmp/resolv_unit_test" />
       <option name="append-bitness" value="true" />
   </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_unit_test" />
       <option name="runtime-hint" value="10m" />
       <!-- test-timeout unit is ms, value = 10 min -->
       <option name="native-test-timeout" value="600000" />
   </test>
</configuration>