diff options
| author | 2019-12-17 18:47:02 +0000 | |
|---|---|---|
| committer | 2019-12-17 18:47:02 +0000 | |
| commit | d5214467aa11f7643c4ddc6eece0ab8760b06c8b (patch) | |
| tree | 8871050c12e1a0b6c041a05107fd321cb71536cc | |
| parent | 98be60dd24b2db8a5891a957ea125a0325a821bf (diff) | |
| parent | 094ba71ffb05cb66b2447891419e0cbf556823e0 (diff) | |
Merge changes Ibcdca8e6,Id871be33
* changes:
FrameworksWifiApiTests runtest.sh: do not run with root
Add FrameworksWifiApiTests to MTS
| -rw-r--r-- | wifi/tests/Android.mk | 4 | ||||
| -rw-r--r-- | wifi/tests/AndroidTest.xml | 2 | ||||
| -rwxr-xr-x | wifi/tests/runtests.sh | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/wifi/tests/Android.mk b/wifi/tests/Android.mk index 3453d6ec827f..d2c385b46eb1 100644 --- a/wifi/tests/Android.mk +++ b/wifi/tests/Android.mk @@ -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) diff --git a/wifi/tests/AndroidTest.xml b/wifi/tests/AndroidTest.xml index cae19e46c6af..987fee79fefd 100644 --- a/wifi/tests/AndroidTest.xml +++ b/wifi/tests/AndroidTest.xml @@ -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> diff --git a/wifi/tests/runtests.sh b/wifi/tests/runtests.sh index 7a0dfb08fcfe..4024371dd97d 100755 --- a/wifi/tests/runtests.sh +++ b/wifi/tests/runtests.sh @@ -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) |