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

Commit 5de129f2 authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge "Add mainline TEST_MAPPING to run S module on R base image"

parents 1e68c813 2ac691c0

wifi/TEST_MAPPING

+13 −0
Original line number Diff line number Diff line
@@ -8,5 +8,18 @@ 
        }

      ]

    }

  ],

  "mainline-presubmit": [

    {

      "name": "FrameworksWifiApiTests[com.google.android.wifi.apex]"

    },

    {

      "name": "CtsWifiTestCases[com.google.android.wifi.apex]",

      "options": [

        {

          "exclude-annotation": "android.net.wifi.cts.VirtualDeviceNotSupported"

        }

      ]

    }

  ]

}

wifi/tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ android_test { 
    ],



    test_suites: [

        "device-tests",

        "general-tests",

        "mts",

    ],

wifi/tests/AndroidTest.xml

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 


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

    <option name="test-tag" value="FrameworksWifiApiTests" />

    <option name="config-descriptor:metadata" key="mainline-param"

            value="com.google.android.wifi.apex" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="android.net.wifi.test" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />