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

Commit 1b8b3615 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Add NetworkStackTests / NetworkStackNextTests to mainline-presubmit am:... 

Add NetworkStackTests / NetworkStackNextTests to mainline-presubmit am: 0e6d63fe am: e6781b7b am: 81c798d8

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

Change-Id: Ic81d4467147a70863b64a3067d6dd15c6d96713b
parents 1a9d376f 81c798d8

TEST_MAPPING

+11 −0
Original line number Diff line number Diff line
@@ -14,5 +14,16 @@ 
    {

      "name": "NetworkStackIntegrationTests"

    }

  ],

  "mainline-presubmit": [

    // These are unit tests only, so they don't actually require any modules to be installed.

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

    },

    {

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

    }

  ]

}

tests/unit/Android.bp

+5 −2
Original line number Diff line number Diff line
@@ -47,9 +47,11 @@ java_defaults { 
android_test {

    name: "NetworkStackNextTests",

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

    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"],

    defaults: ["NetworkStackTestsDefaults"],

    static_libs: ["NetworkStackApiCurrentLib"],

    compile_multilib: "both", // Workaround for b/147785146 for mainline-presubmit

}



// Library containing the unit tests. This is used by the coverage test target to pull in the
@@ -70,7 +72,8 @@ android_library { 
android_test {

    name: "NetworkStackTests",

    min_sdk_version: "29",

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

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

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

    defaults: ["NetworkStackTestsDefaults"],

    static_libs: ["NetworkStackApiStableLib"],

    compile_multilib: "both",