diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | platform/android/tests/skipped.txt | 9 | ||||
| -rw-r--r-- | test/fixtures/annotations/antimeridian_annotation_large/expected.png | bin | 1579 -> 1096 bytes |
3 files changed, 13 insertions, 1 deletions
@@ -555,8 +555,11 @@ run-android-core-test-$1-%: android-core-test-$1 adb push mapbox-gl-js/src/style-spec/reference/v8.json $(MBGL_ANDROID_LOCAL_WORK_DIR)/mapbox-gl-js/src/style-spec/reference > /dev/null 2>&1 adb push platform/android/MapboxGLAndroidSDK/build/intermediates/cmake/$(buildtype)/obj/$2/mbgl-test $(MBGL_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 +# Create gtest filter for skipped tests. + $(eval SKIPPED_TESTS := -$(shell sed -n '/#\|^$$/!p' platform/android/tests/skipped.txt | sed ':a;$!N;s/\n/:/g;ta')) + # Kick off the tests - adb shell "export LD_LIBRARY_PATH=$(MBGL_ANDROID_LOCAL_WORK_DIR) && cd $(MBGL_ANDROID_LOCAL_WORK_DIR) && chmod +x mbgl-test && ./mbgl-test --class_path=$(MBGL_ANDROID_LOCAL_WORK_DIR)/classes.dex --gtest_filter=$$*" + adb shell "export LD_LIBRARY_PATH=$(MBGL_ANDROID_LOCAL_WORK_DIR) && cd $(MBGL_ANDROID_LOCAL_WORK_DIR) && chmod +x mbgl-test && ./mbgl-test --class_path=$(MBGL_ANDROID_LOCAL_WORK_DIR)/classes.dex --gtest_filter=$$*:$(SKIPPED_TESTS)" # Gather the results and unpack them adb shell "cd $(MBGL_ANDROID_LOCAL_WORK_DIR) && tar -cvzf results.tgz test/fixtures/* > /dev/null 2>&1" diff --git a/platform/android/tests/skipped.txt b/platform/android/tests/skipped.txt new file mode 100644 index 0000000000..cf28656836 --- /dev/null +++ b/platform/android/tests/skipped.txt @@ -0,0 +1,9 @@ +# Flaky +# After map is rendered, main thread hangs in runloop::wake when data is written to pipe +# Issue: https://github.com/mapbox/mapbox-gl-native/issues/13711 +Memory.Raster +Memory.Vector + +# Exception is thrown when network status is changed to online +# Issue: https://github.com/mapbox/mapbox-gl-native/issues/13711 +Map.Offline diff --git a/test/fixtures/annotations/antimeridian_annotation_large/expected.png b/test/fixtures/annotations/antimeridian_annotation_large/expected.png Binary files differindex 3e8de0b38c..d6fcadd968 100644 --- a/test/fixtures/annotations/antimeridian_annotation_large/expected.png +++ b/test/fixtures/annotations/antimeridian_annotation_large/expected.png |
