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

Commit 914656b6 authored by Luke Huang's avatar Luke Huang Committed by Gerrit Code Review
Browse files

Merge "Enable mainline-presubmit for DnsResolver"

parents 6a9603a1 0b28368b

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ filegroup { 
cc_test {

    name: "resolv_unit_test",

    test_suites: [

        "device-tests",

        "general-tests",

        "mts",

    ],

    require_root: true,

TEST_MAPPING

+7 −0
Original line number Diff line number Diff line
@@ -5,5 +5,12 @@ 
        { "name": "resolv_unit_test" },

        { "name": "resolv_stress_test" },

        { "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]" }

    ]

}

resolv_test_config_template.xml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,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" />

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

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

       <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />

tests/Android.bp

+5 −4
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ cc_library_static { 


cc_test {

    name: "resolv_gold_test",

    test_suites: ["device-tests", "mts"],

    test_suites: ["general-tests", "mts"],

    require_root: true,

    // b/151392634, this is a workaround because MTS

    // can not handle the test with testdata correctly.
@@ -113,7 +113,7 @@ cc_test { 


cc_test {

    name: "resolv_stress_test",

    test_suites: ["device-tests", "mts"],

    test_suites: ["general-tests", "mts"],

    // This won't work with test_config

    // require_root: true,

    // TODO: Remove resolv_test_mts_coverage_defaults after mts coverage switched to 64-bit device.
@@ -142,7 +142,7 @@ cc_test { 


cc_test {

    name: "resolv_integration_test",

    test_suites: ["device-tests", "mts"],

    test_suites: ["general-tests", "mts"],

    require_root: true,

    test_config_template: ":resolv_test_config_template",

    defaults: ["netd_defaults", "resolv_test_defaults"],
@@ -213,7 +213,8 @@ cc_test { 
        "resolv_stats_test_utils_test.cpp",

    ],

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

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    test_mainline_modules: ["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
@@ -15,6 +15,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" />

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

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

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