diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-11-08 18:38:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-08 18:38:29 +0100 |
| commit | 2b81dee8d39fc25d71a90d2aac700dd555cc9b68 (patch) | |
| tree | 00391a407d479bfa1a0199a2dc9399a8145e366c | |
| parent | bcdbbbcac2e331ea3a23085b1e0f5a0f5d25e0a7 (diff) | |
| download | qtlocation-mapboxgl-2b81dee8d39fc25d71a90d2aac700dd555cc9b68.tar.gz | |
[android] - update make targets (#6958)
| -rw-r--r-- | Makefile | 32 | ||||
| -rw-r--r-- | platform/android/.gitignore | 2 | ||||
| -rw-r--r-- | platform/android/bitrise.yml | 8 |
3 files changed, 29 insertions, 13 deletions
@@ -494,6 +494,10 @@ android-lib-$1: build/android-$1/$(BUILDTYPE)/Makefile android-$1: android-lib-$1 cd platform/android && ./gradlew --parallel --max-workers=$(JOBS) assemble$(BUILDTYPE) +.PHONY: run-android-$1 +run-android-$1: android-$1 + cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:installDebug && adb shell am start -n com.mapbox.mapboxsdk.testapp/.activity.FeatureOverviewActivity + apackage: android-lib-$1 endef @@ -502,22 +506,33 @@ $(foreach abi,$(ANDROID_ABIS),$(eval $(call ANDROID_RULES,$(abi)))) .PHONY: android android: android-arm-v7 -.PHONY: android-test -android-test: - cd platform/android && ./gradlew testDebugUnitTest --continue +.PHONY: run-android +run-android: run-android-arm-v7 + +.PHONY: run-android-unit-test +run-android-unit-test: + cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:testDebugUnitTest --continue + +.PHONY: android-ui-test +android-ui-test: + cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:assembleDebug --continue && ./gradlew :MapboxGLAndroidSDKTestApp:assembleAndroidTest --continue -.PHONY: android-test-apk -android-test-apk: - cd platform/android && ./gradlew assembleDebug --continue && ./gradlew assembleAndroidTest --continue +.PHONY: run-android-ui-test +run-android-ui-test: + cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:connectedAndroidTest -i .PHONY: apackage apackage: cd platform/android && ./gradlew --parallel-threads=$(JOBS) assemble$(BUILDTYPE) -.PHONY: android-generate-test -android-generate-test: +.PHONY: test-code-android +test-code-android: node platform/android/scripts/generate-test-code.js +.PHONY: android-ndk-stack +android-ndk-stack: + adb logcat | ndk-stack -sym build/android-arm-v7/Debug + #### Miscellaneous targets ##################################################### .PHONY: style-code @@ -529,6 +544,7 @@ clean: -rm -rf ./build \ ./platform/android/MapboxGLAndroidSDK/build \ ./platform/android/MapboxGLAndroidSDKTestApp/build \ + ./platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/gen \ ./platform/android/MapboxGLAndroidSDK/src/main/jniLibs \ ./platform/android/MapboxGLAndroidSDKTestApp/src/main/jniLibs \ ./platform/android/MapboxGLAndroidSDK/src/main/assets diff --git a/platform/android/.gitignore b/platform/android/.gitignore index b0e8cceb45..81eeaad167 100644 --- a/platform/android/.gitignore +++ b/platform/android/.gitignore @@ -30,5 +30,5 @@ fabric.properties captures/ # Generated test cases -MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/activity/gen/ +MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/gen/ diff --git a/platform/android/bitrise.yml b/platform/android/bitrise.yml index 699f91c445..1959c4392b 100644 --- a/platform/android/bitrise.yml +++ b/platform/android/bitrise.yml @@ -71,7 +71,7 @@ workflows: - content: |- #!/bin/bash echo "Running unit tests from testapp/src/test:" - make android-test + make run-android-unit-test - script: title: Generate Espresso sanity tests run_if: '{{enveq "SKIPCI" "false"}}' @@ -79,7 +79,7 @@ workflows: - content: |- #!/bin/bash echo "Generate these test locally by executing:" - make android-generate-test + make test-code-android - script: title: Run Firebase instrumentation tests run_if: '{{enveq "SKIPCI" "false"}}' @@ -90,7 +90,7 @@ workflows: wget -O platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/developer-config.xml "$BITRISEIO_TEST_ACCESS_TOKEN_UI_TEST_URL" echo "Build seperate test apk:" - make android-test-apk + make android-ui-test echo "Run tests on firebase:" gcloud auth activate-service-account --key-file secret.json --project android-gl-native @@ -223,7 +223,7 @@ workflows: - content: |- #!/bin/bash echo "Generate these test locally by executing:" - make android-generate-test + make test-code-android - script: title: Run AWS Device Farm instrumentation tests inputs: |