summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2017-09-19 13:00:53 +0300
committerIvo van Dongen <ivovandongen@users.noreply.github.com>2017-09-19 16:45:12 +0300
commit53d072cbf539b30301fe3b77336751bf2c29af89 (patch)
tree2de5d9794fde5e8ecdf91e5f13f6196e45418606 /Makefile
parent975d6b1698609a1adad3dcbe40c76c831be913d3 (diff)
downloadqtlocation-mapboxgl-53d072cbf539b30301fe3b77336751bf2c29af89.tar.gz
[android] ignore failed uninstalls
- ensures targets run whether the app was installed before on the device or not
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index f3bc93ac4f..c9a3a71649 100644
--- a/Makefile
+++ b/Makefile
@@ -534,7 +534,7 @@ run-android-core-test-$1: run-android-core-test-$1-*
# Run the test app on connected android device with specified abi
.PHONY: run-android-$1
run-android-$1: platform/android/configuration.gradle
- adb uninstall com.mapbox.mapboxsdk.testapp > /dev/null
+ -adb uninstall com.mapbox.mapboxsdk.testapp 2> /dev/null
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:install$(BUILDTYPE) && adb shell am start -n com.mapbox.mapboxsdk.testapp/.activity.FeatureOverviewActivity
# Build test app instrumentation tests apk and test app apk for specified abi
@@ -545,12 +545,12 @@ android-ui-test-$1: platform/android/configuration.gradle
# Run test app instrumentation tests on a connected android device or emulator with specified abi
.PHONY: run-android-ui-test-$1
run-android-ui-test-$1: platform/android/configuration.gradle
- adb uninstall com.mapbox.mapboxsdk.testapp > /dev/null
+ -adb uninstall com.mapbox.mapboxsdk.testapp 2> /dev/null
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:connectedAndroidTest
# Run Java Instrumentation tests on a connected android device or emulator with specified abi and test filter
run-android-ui-test-$1-%: platform/android/configuration.gradle
- adb uninstall com.mapbox.mapboxsdk.testapp > /dev/null
+ -adb uninstall com.mapbox.mapboxsdk.testapp 2> /dev/null
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="$$*"
endef