diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2017-02-22 17:55:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-22 17:55:12 +0100 |
| commit | 586ae94ec4cfd3ea5b223ba36fc519ef8ada5eff (patch) | |
| tree | 6035c89b45b0db0526d96f48427219a824199eab /Makefile | |
| parent | 10b8ef644188ee02cdce5b8db35fed1c32688758 (diff) | |
| download | qtlocation-mapboxgl-586ae94ec4cfd3ea5b223ba36fc519ef8ada5eff.tar.gz | |
[android] - uninstall current apk on test device before running a make run- command. (#8160)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -568,6 +568,7 @@ run-android-core-test-$1: run-android-core-test-$1-* .PHONY: run-android-$1 run-android-$1: android-$1 + adb uninstall com.mapbox.mapboxsdk.testapp > /dev/null cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:install$(BUILDTYPE) && adb shell am start -n com.mapbox.mapboxsdk.testapp/.activity.FeatureOverviewActivity apackage: android-lib-$1 @@ -607,10 +608,12 @@ android-ui-test: .PHONY: run-android-ui-test run-android-ui-test: + adb uninstall com.mapbox.mapboxsdk.testapp > /dev/null cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:connectedAndroidTest -i run-android-ui-test-%: - cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="$*" + adb uninstall com.mapbox.mapboxsdk.testapp > /dev/null + cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="$*" .PHONY: run-android-ui-test-aws run-android-ui-test-aws: |