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

Commit 774d73cf authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7080991 from 3bf73d84 to sc-release 

Change-Id: Ibaf08d74f137fe6e1c29fee81b1b03051c535737
parents 49565669 3bf73d84

TEST_MAPPING

+6 −5
Original line number Diff line number Diff line
@@ -7,10 +7,11 @@ 
        { "name": "resolv_stats_test_utils_test" }

    ],

    "mainline-presubmit": [

        { "name": "resolv_integration_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },

        { "name": "resolv_gold_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },

        { "name": "resolv_unit_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },

        { "name": "resolv_stress_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },

        { "name": "resolv_stats_test_utils_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" }

        // TODO: add back the tethering module when it is updatable in this branch

        { "name": "resolv_integration_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },

        { "name": "resolv_gold_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },

        { "name": "resolv_unit_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },

        { "name": "resolv_stress_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },

        { "name": "resolv_stats_test_utils_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" }

    ]

}

resolv_test_config_template.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
<configuration description="Configuration for {MODULE} tests">

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

   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />

   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex" />

   <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

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

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

tests/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ cc_test { 
    ],

    static_libs: [

        "dnsresolver_aidl_interface-unstable-ndk_platform",

        "libbpf_android",

        "libcrypto_static",

        "libgmock",

        "libnetd_test_dnsresponder_ndk",
@@ -214,7 +213,10 @@ cc_test { 
    ],

    defaults: ["netd_defaults", "resolv_test_defaults"],

    test_suites: ["general-tests"],

    test_mainline_modules: ["CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex"],

    test_mainline_modules: [

        "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex",

        "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex"

    ],

    static_libs: [

        "libgmock",

        "libprotobuf-cpp-lite",

tests/resolv_gold_test_config.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
<configuration description="Configuration for resolv gold tests">

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

   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />

   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex" />

   <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

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

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

tests/resolv_integration_test.cpp

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <arpa/inet.h>

#include <arpa/nameser.h>

#include <binder/ProcessState.h>

#include <bpf/BpfUtils.h>

#include <cutils/sockets.h>

#include <gmock/gmock-matchers.h>

#include <gtest/gtest.h>