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

Commit 226da6ec authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Android (Google) Code Review
Browse files

Merge "Do not install tethering in TEST_MAPPING"

parents 81ce29f8 b679b6a4

TEST_MAPPING

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
    // We must specify at least one module here or the tests won't run. Use the same set as CTS

    // so in theory the infra would not need to reinstall/reboot devices to run both.

    {

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

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

      "name": "NetworkStackTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]"

    }

  ],

  "imports": [

tests/unit/Android.bp

+8 −2
Original line number Diff line number Diff line
@@ -50,7 +50,10 @@ android_test { 
    min_sdk_version: "29",

    srcs: [], // TODO: tests that only apply to the current, non-stable API can be added here

    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"

    ],

    defaults: ["NetworkStackTestsDefaults"],

    static_libs: ["NetworkStackApiCurrentLib"],

    compile_multilib: "both", // Workaround for b/147785146 for mainline-presubmit
@@ -76,7 +79,10 @@ android_test { 
    min_sdk_version: "29",

    target_sdk_version: "30",

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

    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"

    ],

    defaults: ["NetworkStackTestsDefaults"],

    static_libs: ["NetworkStackApiStableLib"],

    compile_multilib: "both",