From d1b386e3fca882a756dcc57becb6db0767e3e5fe Mon Sep 17 00:00:00 2001
From: Alexander Shalamov <alexander.shalamov@mapbox.com>
Date: Tue, 8 Jan 2019 12:12:32 +0200
Subject: [PATCH] [android] Add list of skipped core unit tests

---
 Makefile                                      |   5 ++++-
 platform/android/tests/skipped.txt            |   9 +++++++++
 .../expected.png                              | Bin 1579 -> 1096 bytes
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 platform/android/tests/skipped.txt

diff --git a/Makefile b/Makefile
index 434ce6e0d..06a57b641 100644
--- a/Makefile
+++ b/Makefile
@@ -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 000000000..cf2865683
--- /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
index 3e8de0b38c422584e55a375c7366355e2aaaf882..d6fcadd96889205edbd4d93a93e687f0df2f2f45 100644
GIT binary patch
literal 1096
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|GzJD1eoq(2kcv5P?^dr^8q9F)
z;rY@#y#h*;z4bg*I$M+`ns`pSq@w95<mssdgetB;=;_pJ(jidP`(&DTN6Ve{$A8bQ
z^-DjtAnpCs{A+RNFaMdfzbyUy9Mk;gXV%#6ehsvV#-Jf6?Nf5vH}wUUYz$Iq3=0y8
zqs(qHoT-_0&p&_J^h=jBE2|XlPR;YYzEt~?>&rPMRaTa=^ZR_*m;b#am-&24Y}6bx
zU+HCEFIlD5Up=tqBYQ&H`kn3n?*E-w=WD+#|MK*glfT4ODes*y&!>Oc@5^&vJ}b%H
zWfME&oZs@LlP?v%>?jGiW&U<vnb+-Qx|h}3I#z~0WLU%dcV?ac{w4C4%wKkYDXdc8
zJ8ho7_NBuw_m#Ns(u|#}=PSNs^QBECNmgpI)A)RTFNwX}mpOZj>n)4i3D<P%I5MU)
zuGsZc@t0-o{C$4&m-An~{c`G;oGKgJDepYDFO|L&`f^f9+|OWFQ=W!X^R-qbGKBmK
z3FKv7@M(EhmIT98`_PcX3@iSuTqMQj@YG-QssY0*`<eCoPkg8{-*w`HOVyI-uS$na
zUvA3#+Rbx(+2P%--8{QX^^Deh<!RW(X#eAs`Ko^}l@71IyGmU0o$vPL(jW!Tmm6PR
z`Ld;?#L7f=!Z*L&OJpxy%ly10FlxWC%jReHg2^_Q7<_!2?HdoiZhx^ouVnG7-Csg~
z>C{fR=cT_q{ZjJFgC*s=Ok?M-^ATTOd|C44lr1K*Q~5l9FSorsX-n-bt=ws1rHd7%
zzSRBvlYc;>--IFf@&kW|;;;H8FWX-%&r9t1wZ6mdm79Lq%i}BluX=IxON_bH(&f7@
zZqL%@X*ibsL4Co_f7uN8-iFCH{Cm2c%|Y1ghp>dreWo=(m3a?bF}cJ3eR>1)?Efx3
zA3c~2On;^yNRz}CP+Ik?R<tn&;0oJ@RiE!S8A~!7T$H!T=W)8LCDTw}oxS1T(V%-$
zJlBr=U^e)jk<Z6vIy;A<VU;99#tg=WHlipR=Odu;8t?S4MRDdI_A~4OS?1~L=d#Wz
Gp$PysGo7&j

literal 1579
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G!U;i$lZxy-8q?;3=FJKJzX3_
zDj471e(2X6z{7Uo?2muzZJyqb@Yr@&B=2_hv>6<I-ql+1A|J~>D>*bUFfy@l2q=s)
zhFBmdcs(fGZM&_1#n&~#{tuSNozzluQ1EhKaPf?4cW`863@FI(QWH>BU|6KG)_K8#
z1_lia6IJ03ApwTKN!Jtu0vs4bWM)m`bm8P^(C~aMprN6_z{Tf#l4TJKi^G&9r5qw6
z0t~F}%TkyEnV1y3E?Kc~ad9*>IR_gxYA`YisAkGCv9i{2Ut9A;gz0v@Q2ftb_t)Fp
z)_N|)u-a!=&HQlobAl231%w#fi?{V3Sm@9uaEq&(TZys2BEy<9MXZBc$(+&nd}J<*
zpO^rHI&<_qhcrgU36)k^$_1Mm7%U`jd}1-;=4d!`IZ(QBGAql0lLw}$Pl$A2NSW7n
zi(`(?hyOATckYYWuQz??*mnN>%egEZd$@e61Tx%S?Af+2mwS=2=<jQSGej678(0IU
zd9FzAYp7-@zB6~K16SkGdZrKB4qfk^Tz!OrD)jbb3YRA_`7`}ze2`T0>4RqDQkFZ+
z5m|R;scsM#V5sJgW|;;IH1FQ%%`D%Tm=fM6b{_}=(klzIryYoMV0dGjBNzb;cOBEb
zvqCqxL5_%T(Pd)UC)iP4=FU*__}$)a?jx}kkqWF1K$kr3b=cqi-uLkInn;G2Lw7!^
z=$+sTE*0KzSmdii0x(i|4q5g%uro4VNbIUoFaSmh+d~<*1<ef%FAQ951tfrx(p<o&
ze8JIyp=8D)ISw9Rq&Ql%3%*cLV6gHD<Y!?62A0B{!yF|70t~XtR<JWQ1KlccE|JBG
wgQI~j_zH6)Fl`ucJU1B4^+UJlli~Qo$g)6a`tcPfLDd3-r>mdKI;Vst0G7v4q5uE@