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

Commit 7b230c32 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Use ConnectivityTestTargetPreparer in doh_ffi_test" into main am: f4bdd6be 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/3093743



Change-Id: Ie0a20c8dcef7664718c78c59e1b2ecccdc4e9e32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d4202f1e f4bdd6be

tests/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ cc_test { 
        "resolv_test_defaults",

        "resolv_test_mts_coverage_without_root_defaults",

    ],

    test_config: "doh_ffi_test_config.xml",

    header_libs: [

        "libnetd_resolv_internal_headers",

    ],
@@ -369,6 +370,10 @@ cc_test { 
        "libnetd_client",

        "libstatssocket",

    ],

    host_required: [

        "net-tests-utils-host-common",

    ],

    data: [":ConnectivityTestPreparer"],

}



cc_defaults {

tests/doh_ffi_test_config.xml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2024 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 doh_ffi_test">

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

   <target_preparer class="com.android.testutils.ConnectivityTestTargetPreparer">

       <option name="ignore-mobile-data-check" value="true" />

   </target_preparer>



   <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

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

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

       <option name="append-bitness" value="true" />

   </target_preparer>



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

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

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

   </test>

</configuration>