From 1387fe8f9c474e88f86828733d4c01bd56f44432 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 11 Jan 2018 19:22:37 +0100
Subject: [PATCH] [test/text-rendering-tests] Update from upstream

---
 test/shaping/data/text-rendering-tests/DISABLED  |   1 +
 .../data/text-rendering-tests/Makefile.sources   |   2 ++
 .../fonts/TestMORXTwelve.ttf                     | Bin 0 -> 2200 bytes
 .../text-rendering-tests/tests/MORX-12.tests     |   3 +++
 4 files changed, 6 insertions(+)
 create mode 100644 test/shaping/data/text-rendering-tests/fonts/TestMORXTwelve.ttf
 create mode 100644 test/shaping/data/text-rendering-tests/tests/MORX-12.tests

diff --git a/test/shaping/data/text-rendering-tests/DISABLED b/test/shaping/data/text-rendering-tests/DISABLED
index 610e1957e..809edb610 100644
--- a/test/shaping/data/text-rendering-tests/DISABLED
+++ b/test/shaping/data/text-rendering-tests/DISABLED
@@ -13,6 +13,7 @@ tests/MORX-8.tests
 tests/MORX-9.tests
 tests/MORX-10.tests
 tests/MORX-11.tests
+tests/MORX-12.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 e09091a60..a3acf2766 100644
--- a/test/shaping/data/text-rendering-tests/Makefile.sources
+++ b/test/shaping/data/text-rendering-tests/Makefile.sources
@@ -28,6 +28,7 @@ TESTS = \
 	tests/HVAR-2.tests \
 	tests/KERN-1.tests \
 	tests/KERN-2.tests \
+	tests/MORX-12.tests \
 	tests/SHBALI-3.tests \
 	tests/SHKNDA-1.tests \
 	$(NULL)
@@ -36,6 +37,7 @@ DISBALED_TESTS = \
 	tests/CMAP-3.tests \
 	tests/MORX-10.tests \
 	tests/MORX-11.tests \
+	tests/MORX-12.tests \
 	tests/MORX-1.tests \
 	tests/MORX-2.tests \
 	tests/MORX-3.tests \
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwelve.ttf b/test/shaping/data/text-rendering-tests/fonts/TestMORXTwelve.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..b1e4bc447adba6c2b14f2f60c205f39174563de0
GIT binary patch
literal 2200
zcmb7FUrbY182`?>wHG22YyW^7a~CeOmQj%2(n76*Xb4CJp#oJDb_bPi0o%~3xJ=!H
zE*o(fSr%jF9`Ip*Of)mgmiVB{-1guwCVSW)ABOv%@UlHQlWnox@7xw+H?w5t<h$ql
zzVrS0ecwIzTw+ADl3pN*HuOdsyzz=xgG8(u+NZ{*^dy~MKM46U<nYAgk^NVWFWn^K
z<)DRlOdl^jclk8-u7Lb;DCFm)_2BP-s^e4X8Ot=g1phOTmC3}I&ReB2_?jTwru3O4
z&CqV_BOWPJiRl?-i0>nkzlD6|fIbxqwGLMinSO@PC&@%AP0jQ+_TR<6j|6tm;-S}D
zMoUA#lO!!cLth_#;=9~BP)wBlT$+=FrA%CCF(64x*=F$+qBLhj672Gj4NWlx(HAio
zeAm$maN~vyC;l0mgQkej@+frOxs{EOm(>XyVf?T$&^^>cZKSwPNeVDr2Zrmg69|dj
z;i8iYs*TbJLznn5&@AbEhBom*GQm1(OyMCJUL|BgJfadR0!kCSHQGv1*QspQh}B42
zAkAj8*&niBWv^u~-g-Wl4ZF+3PImHBoaX2PeZw3qhDakw@dsZ(7MaLeX{oHSR9Z&Z
z*-VVZGdK9cJ-^1s@4cDpDnG_=!mgC4rczd!##G7abeUyYV>dFt3=FffKIYhWO}5FU
ztNVUjT;w<JX?%rk^V(3uEo9J9<u2q}MP;IT=5^R@X4x*Ds%o)%{Y^fns@g4Do@1Wb
zlO65zC(?i2j&??d56$iA?H_rWFZ7SLMoLyZHm5(!7cyV8go3`GGVgb^g|?vLP1(DA
zH~*5vSu@*h4$T{|o6TyKv&rZ8YhFj0>{OX@;^>hbBkKo)=ib?Qb}|riR}Y5y$v0kn
z=}bjW>8ejJPQA6)VGFxN_r=@k0OplMm6D`dCCzHpBrE&=>c^wM-X4GN(&*xE%%53c
zX*QTyV&$0&nOV3{G=CyXX)R8+b2+`J)vN|Asu_j*0~U7TY9etpnKYg)9ge1&=H|eC
z1=REG&+_Uu+so@RdkUh~J|t?B8t@1FMi;BhvgQ-@+HEp26{MM8@@-q|d9tr#dxZ74
zovvD+_DW&Sps&56acAA;?w)P6b+xM2)_T0NAbZQdvm1F``Q&!HW^~(lvvvc9@eWk+
zMhd`m>rD-N2fDh3J9&e<wm#TwTN7$;s`q%qL)`_SPWNv0ZY_R%X!G{2jV9IYu5o*U
zjUIP>oy*+Xojc*hG%das6Yc{FfpR>f3P?Gg<LpKAyou^)f1Wpke=W}!)1&lJo_~a`
zBXM#?%vIFG?&f(bmGEu&{t}d=Bgpy;P2jsq<5Zsqd1(VR;to@2fDT}940hubLk@+y
zpc$ij+66fUj~&!Y{lK(~4ns3Zhw$tNP0&F|I%5BqrSd;)J^!$cAbJW|;#d`GM<(6C
zATq{*It6V9kRLGWih$b>?y!L=hP|A{q)}fCRw<w!hyEaVQSCJNG$IMx2<i@F?M1(Y
z?SqlS1rZb)G<;Lgirfl1S#OZ?0ItHU%UE=DPluoA+tYZ8%!eTh6bf`A>lW%W_%v>P
z1^P5*5_|)u=!STgN$66@Dlkl9O+Y(={a*No@B5_kUg8Yo>QA8dX~c*<;8Tb+bw7$H
zUsn`}+Qm%{S=<}O$bN`3^spgLwnWubLr&UAHr(fqybr^UpbtPIig9y^6@LWrhY)+q
z<CK!)gib_U4Z?qt_L3R*of$IE|79fn;7lMhri@ucMMg9j8$<jtC0GcX+!S_2;EQqw
T^H>yQZxh4~6bw412t@pEyrGnW

literal 0
HcmV?d00001

diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-12.tests b/test/shaping/data/text-rendering-tests/tests/MORX-12.tests
new file mode 100644
index 000000000..8b9886fc2
--- /dev/null
+++ b/test/shaping/data/text-rendering-tests/tests/MORX-12.tests
@@ -0,0 +1,3 @@
+../fonts/TestMORXTwelve.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0058,U+0041,U+0042,U+0043,U+0058,U+0031:[X|C@598,0|A@1230,0|B@1868,0|X@2518,0|one@3116,0]
+../fonts/TestMORXTwelve.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0058,U+0041,U+0042,U+0043,U+0058,U+0032:[X|C@598,0|A@1230,0|B@1868,0|X@2518,0|two@3116,0]
+../fonts/TestMORXTwelve.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0058,U+0041,U+0042,U+0043,U+0058,U+0033:[X|B@598,0|C@1248,0|A@1880,0|X@2518,0|three@3116,0]