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

Commit 8d093f94 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Revert "Do not install tethering in TEST_MAPPING" am: f26585ce am: be6767ee 

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

Change-Id: Iccd40bd166a7b3fe5d4fb3a38690a807ff2f76b1
parents 276cd594 be6767ee

TEST_MAPPING

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

    ],

    "mainline-presubmit": [

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

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

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

+1 −4
Original line number Diff line number Diff line
@@ -276,10 +276,7 @@ cc_test { 
    ],

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

    test_suites: ["general-tests"],

    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"

    ],

    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

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