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

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

Merge changes Ibcdca8e6,Id871be33 

* changes:
  FrameworksWifiApiTests runtest.sh: do not run with root
  Add FrameworksWifiApiTests to MTS
parents 98be60dd 094ba71f

wifi/tests/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ LOCAL_JAVA_LIBRARIES := \ 


LOCAL_PACKAGE_NAME := FrameworksWifiApiTests

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_COMPATIBILITY_SUITE := \

    device-tests \

    mts \



include $(BUILD_PACKAGE)

wifi/tests/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->

<configuration description="Runs Frameworks Wifi API Tests.">

    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="test-file-name" value="FrameworksWifiApiTests.apk" />

    </target_preparer>

wifi/tests/runtests.sh

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ $ANDROID_BUILD_TOP/build/soong/soong_ui.bash --make-mode MODULES-IN-frameworks-b 


set -x # print commands



adb root

adb wait-for-device



TARGET_ARCH=$($ANDROID_BUILD_TOP/build/soong/soong_ui.bash --dumpvar-mode TARGET_ARCH)