From 1242ad8424f5e8357fe6fd2143430aa8cfaf0954 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 8 Feb 2018 14:10:01 -0600
Subject: [PATCH] [test/text-rendering-tests] Update from upstream

---
 test/shaping/data/text-rendering-tests/DISABLED  |   2 ++
 .../data/text-rendering-tests/Makefile.sources   |   2 ++
 .../fonts/TestMORXTwentyfive.ttf                 | Bin 0 -> 3260 bytes
 .../fonts/TestMORXTwentysix.ttf                  | Bin 0 -> 3260 bytes
 .../text-rendering-tests/tests/MORX-25.tests     |   9 +++++++++
 .../text-rendering-tests/tests/MORX-26.tests     |   2 ++
 6 files changed, 15 insertions(+)
 create mode 100644 test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyfive.ttf
 create mode 100644 test/shaping/data/text-rendering-tests/fonts/TestMORXTwentysix.ttf
 create mode 100644 test/shaping/data/text-rendering-tests/tests/MORX-25.tests
 create mode 100644 test/shaping/data/text-rendering-tests/tests/MORX-26.tests

diff --git a/test/shaping/data/text-rendering-tests/DISABLED b/test/shaping/data/text-rendering-tests/DISABLED
index 51174553..dbe870f1 100644
--- a/test/shaping/data/text-rendering-tests/DISABLED
+++ b/test/shaping/data/text-rendering-tests/DISABLED
@@ -24,6 +24,8 @@ tests/MORX-20.tests
 tests/MORX-21.tests
 tests/MORX-22.tests
 tests/MORX-23.tests
+tests/MORX-25.tests
+tests/MORX-26.tests
 
 # Rounding differences
 tests/SHARAN-1.tests
diff --git a/test/shaping/data/text-rendering-tests/Makefile.sources b/test/shaping/data/text-rendering-tests/Makefile.sources
index b12f1733..f77c1bce 100644
--- a/test/shaping/data/text-rendering-tests/Makefile.sources
+++ b/test/shaping/data/text-rendering-tests/Makefile.sources
@@ -48,6 +48,8 @@ DISBALED_TESTS = \
 	tests/MORX-21.tests \
 	tests/MORX-22.tests \
 	tests/MORX-23.tests \
+	tests/MORX-25.tests \
+	tests/MORX-26.tests \
 	tests/MORX-2.tests \
 	tests/MORX-3.tests \
 	tests/MORX-4.tests \
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyfive.ttf b/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyfive.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e3fadf519148b310ef27ab9f8ad758f8980df442
GIT binary patch
literal 3260
zcmbVOZ%kX)6+ibr^9&(@IQW^QNty?b*er{o`1ubY^2gzif*?4=kfduuaAUw3c5H!Z
zfNovK$eKh-LsV(1)~0IHrcu;JX{%LQrlP8<s#3B_`7l-eux#3<Y5lf-$fj)-_I~&I
zL2(IdwfA)HJ@?#m?)jZ_&%5suBcft@nk0H86t4Bew#3d5v3f}RPbMNM8mD6z{}$t>
zq4>n$+WQqVM0_WaJRKW|L`y$D{|V;a1NmbRSSO_&;O~Q~Vu|#)<8f&i_RnMNi6>7+
zivPY2JTDaUiO6`0rsz24H)5<Nk|X14+mueUc0I;#o{l62_EaB#o2c+D*nFN!j;8sk
zyZ-{<bC^F%0y{`)3cY@!wCNutNnb!hpFMR>HTqX(zaq+hBF#ub(@I=O@n9r<k*yc4
z7)dk6O2(Ag6dDp6?WO`l!eINb!ADIEN!rh5ASvV*_)*9@ay{!K4?}jyG&HrBb-f)&
zx@a${)GDdKFb52Cm=*|$-RB~cDxy6?ePUhy6VM1ncn^8_RrEV40*j*$c*O!DLJ4F?
zD^|3Vg{slZ=tT_hn$2RYQZSp%{we!`p#=dR1+SlCG()%OBUZv<>{skRyn!e9Tl{a*
zMrj}H`+)J^d>*S?iOMQ$729nUwm$YkW`M;qcli8*U+2+<7Y!W5pW>fFuaszeg;irZ
z(<G<UC0ngJyOa5A?_;dIn>mhuV6|II*LVN<-aY>5g3b%<yEiq}ehv>2gwq3GB~%W)
z#5@kgE?X7RYMQOg<M(-;nx@!vlVk1+XWRC@Je~gP4@dWhAA4fv2cbiK=lT4h6MMpI
z3pUS0e#qxDcN>}-y?@EP)3&!Mh}b>ZfATK=JKBi&WyS8$Jpo0QwMwVY>-Xy(N4eFh
zF=hJ469@XL4>!JY{oo7nz`*ya4tMgizx?^R=eKl~mV9_KaqXDH-suwA7nrXAb0OJK
z-~uNWQJlbOz~omxeCOlezxLjV3)5qf%a?E8=JW5~IDc;8?xl;O0$|O)gmp2IZmUoh
z-w3;uxx=)~J?7){p+9zIL)guuW?h%kHgZudk;S<PT4YGpc5~#%sa47%E{87ZWtvN~
zYTI2-pJumO+4O8OIh#ruZRFMd{#PTp_MwJ1TD({F7ACt(EbH8XB_*iVFKI!S@5+Ry
zrhYx?Qnsj*DEH-v+^D2o$f+ZTrP9Q<!7n!LYfu}^%@j$pTV0Dgxxwef#-fr|f%t4q
zPy5T$M|wjqw(Hfk-r(EO1Kko^4s?N*BV|KAS7VUf^fb0B<=ZONt(n=5w#(v6S&rHJ
ztvNKJ&^@9kDv?#AShQ6W*_TL1_xm@w8=5<w+q0u)*Xo&kW^6b%zFBuXdhq)CdK`WE
zyIcL8cGvhiG%er}xwEYb>K7M>#wL<Kow#vj@9KE?uHnIW%6ILh%<MOE^!;zmk)$iw
zx*V;FVls34)~(x_|Aip%r0-H7&wDv4eMObK0(!YFX;PWrr`yZR^LOKC`c-es8x1#q
zv(8fDp2+hyH#Nm>X2Q&)Zc$v5c^ThIPI9mG6flk%SMJoYl^G?A4_whbie1b1yRE&a
zrY6*TWV$uzt*zGE4@CRB^SuWfUB0zSd!q*s#<!}K+q`WZ;{5o!9;;R&@CST2ns73q
z1OvGebm)0G?yT9d=edsN2KOfa{%AUp$aDHWYU}#JM;-d+@!0TKe)VsBU~bKWRRp^t
zMkP5hHgvId@0A<gJTG&p_~5XJ>ZNOW@oZihPr#@7^c>|E?DWd&m<wF;JsHS^ai$c}
z2<n1aioiF4ay+9djB-53KcnB|E##%sCNG1(YVt+&5PfFy>)6BerOB627cVjSGFror
zQ8OheMHBFPiiYriOyh5K1LUDcsE+Ev^}@p`Itjff4bV<V+95efHPnOgC@c<8hz{YO
z-9u*}ISt7K4Z`LLj1GZ@XpG`G|3|))h5CQkxW8c&hPP2*jG<R)A3R44Yyv?H$VMS;
zLqr0rN?~w=;LaEr2O!C5#ErN`M5Blz3i%j#k%bZPX{;o4!^lS``VjIcbeFH(nYV&U
zhYj0NNQG||8Llx%U4|>)>mrs2vKfJ$$m8Q^h37LE3lu73!fTMa4L(hc=*3>9fvFKE
zY^{+EvBxRMM&VUph@(#;mLbfCVBfi9Giq9i+Q`M9MC>ET=)f|Ye59jGtGLa$g2;R`
zwNPvB#)RAIyQr%NJ-APxDywKaPA3;tGtMMtVFgTPR#wQ0*cw(`5Uh#B(*^sCw%KS~
zjJ8#@vN2mH8`E{NF<&Pe3U#ufQ78Q7?#K+Bpw~<Z!wD%KhFhb!KZ?1<=SOO8EMzjs
y4#MeWe4EE`6XLiVSU|ZK6UHO7`O+)ytYoaso;Lf%v7s#*i@BB+eG#pp;{O7Tuh^9U

literal 0
HcmV?d00001

diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentysix.ttf b/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentysix.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..828f644129f2ffd566c0bc3d98eaaf5cabaec306
GIT binary patch
literal 3260
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

literal 0
HcmV?d00001

diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-25.tests b/test/shaping/data/text-rendering-tests/tests/MORX-25.tests
new file mode 100644
index 00000000..ccd0563d
--- /dev/null
+++ b/test/shaping/data/text-rendering-tests/tests/MORX-25.tests
@@ -0,0 +1,9 @@
+../fonts/TestMORXTwentyfive.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0041,U+0042,U+0043,U+0044,U+0045:[A.alt|B.alt@1000,0|C.alt@2000,0|D.alt@3000,0|E.alt@4000,0]
+../fonts/TestMORXTwentyfive.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0045,U+0042,U+0043,U+0044,U+0041:[E|B@556,0|C@1182,0|D@1778,0|A@2452,0]
+../fonts/TestMORXTwentyfive.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0043,U+0042,U+0041,U+0042,U+0043:[C|B@596,0|A.alt@1222,0|B.alt@2222,0|C.alt@3222,0]
+../fonts/TestMORXTwentyfive.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0041,U+0042,U+0043:[A.alt|B.alt@1000,0|C.alt@2000,0]
+../fonts/TestMORXTwentyfive.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0043,U+0042,U+0041:[C|B@596,0|A@1222,0]
+../fonts/TestMORXTwentyfive.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0041,U+0042:[A.alt|B.alt@1000,0]
+../fonts/TestMORXTwentyfive.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0042,U+0041:[B|A@626,0]
+../fonts/TestMORXTwentyfive.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0041:[A]
+../fonts/TestMORXTwentyfive.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0042:[B]
diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-26.tests b/test/shaping/data/text-rendering-tests/tests/MORX-26.tests
new file mode 100644
index 00000000..bebae606
--- /dev/null
+++ b/test/shaping/data/text-rendering-tests/tests/MORX-26.tests
@@ -0,0 +1,2 @@
+../fonts/TestMORXTwentysix.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0041,U+0042:[A|B@639,0]
+../fonts/TestMORXTwentysix.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0042:[B.alt]
-- 
GitLab