summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authortobrun <tobrun.van.nuland@gmail.com>2018-06-01 20:08:08 +0200
committerTobrun <tobrun@mapbox.com>2018-06-08 11:29:14 +0200
commit531448828d8e090e35fbe71192cf0803b8356aa2 (patch)
tree582c395f078140d87f28ac395e3057c0769b2c46 /Makefile
parent58b6c42f5d505204ea96faff812885f0d3723614 (diff)
downloadqtlocation-mapboxgl-531448828d8e090e35fbe71192cf0803b8356aa2.tar.gz
[android] - ignore render tests from ignores.json
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8ba8084412..c616b3a567 100644
--- a/Makefile
+++ b/Makefile
@@ -594,9 +594,10 @@ run-android-render-test-$1: $(BUILD_DEPS) platform/android/gradle/configuration.
-adb uninstall com.mapbox.mapboxsdk.testapp 2> /dev/null
# delete old test results
rm -rf platform/android/build/render-test/mapbox/
- # copy test definitions to test app assets folder, clear old ones first
+ # copy test definitions & ignore file to test app assets folder, clear old ones first
rm -rf platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/integration
cp -r mapbox-gl-js/test/integration platform/android/MapboxGLAndroidSDKTestApp/src/main/assets
+ cp platform/node/test/ignores.json platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/integration/ignores.json
# run RenderTest.java to generate static map images
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="com.mapbox.mapboxsdk.testapp.render.RenderTest"
# pull generated images from the device