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

Also adds an update.sh script that does this automatically.
---
 .../data/text-rendering-tests/Makefile.am     |  52 ++----------------
 .../text-rendering-tests/Makefile.sources     |  51 +++++++++++++++++
 .../fonts/TestMORXEight.ttf                   | Bin 0 -> 2184 bytes
 .../fonts/TestMORXNine.ttf                    | Bin 0 -> 1624 bytes
 .../text-rendering-tests/tests/MORX-5.tests   |  25 +++++++++
 .../text-rendering-tests/tests/MORX-6.tests   |   1 +
 .../text-rendering-tests/tests/MORX-7.tests   |   1 +
 .../text-rendering-tests/tests/MORX-8.tests   |   3 +
 .../text-rendering-tests/tests/MORX-9.tests   |   1 +
 .../data/text-rendering-tests/update.sh       |  48 ++++++++++++++++
 10 files changed, 136 insertions(+), 46 deletions(-)
 create mode 100644 test/shaping/data/text-rendering-tests/Makefile.sources
 create mode 100644 test/shaping/data/text-rendering-tests/fonts/TestMORXEight.ttf
 create mode 100644 test/shaping/data/text-rendering-tests/fonts/TestMORXNine.ttf
 create mode 100644 test/shaping/data/text-rendering-tests/tests/MORX-5.tests
 create mode 100644 test/shaping/data/text-rendering-tests/tests/MORX-6.tests
 create mode 100644 test/shaping/data/text-rendering-tests/tests/MORX-7.tests
 create mode 100644 test/shaping/data/text-rendering-tests/tests/MORX-8.tests
 create mode 100644 test/shaping/data/text-rendering-tests/tests/MORX-9.tests
 create mode 100755 test/shaping/data/text-rendering-tests/update.sh

diff --git a/test/shaping/data/text-rendering-tests/Makefile.am b/test/shaping/data/text-rendering-tests/Makefile.am
index 56247b7b6..788db1f6b 100644
--- a/test/shaping/data/text-rendering-tests/Makefile.am
+++ b/test/shaping/data/text-rendering-tests/Makefile.am
@@ -6,61 +6,21 @@ NULL =
 lib:
 	@$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src lib
 
+update:
+	(cd $(srcdir) && ./update.sh)
+
 EXTRA_DIST = \
 	README \
 	COPYING \
+	update.sh \
 	extract-tests.py \
 	fonts \
-	$(TESTS) \
+	tests \
 	$(NULL)
 
 TEST_EXTENSIONS = .tests
 TESTS_LOG_COMPILER = $(srcdir)/../../run-tests.py $(top_builddir)/util/hb-shape$(EXEEXT)
 
-TESTS = \
-	tests/AVAR-1.tests \
-	tests/CFF-1.tests \
-	tests/CFF2-1.tests \
-	tests/CFF-2.tests \
-	tests/CMAP-1.tests \
-	tests/CMAP-2.tests \
-	tests/CVAR-1.tests \
-	tests/CVAR-2.tests \
-	tests/GLYF-1.tests \
-	tests/GPOS-1.tests \
-	tests/GPOS-2.tests \
-	tests/GPOS-3.tests \
-	tests/GPOS-4.tests \
-	tests/GPOS-5.tests \
-	tests/GSUB-1.tests \
-	tests/GSUB-2.tests \
-	tests/GVAR-1.tests \
-	tests/GVAR-2.tests \
-	tests/GVAR-3.tests \
-	tests/GVAR-4.tests \
-	tests/GVAR-5.tests \
-	tests/GVAR-6.tests \
-	tests/GVAR-7.tests \
-	tests/GVAR-8.tests \
-	tests/GVAR-9.tests \
-	tests/HVAR-1.tests \
-	tests/HVAR-2.tests \
-	tests/KERN-1.tests \
-	tests/KERN-2.tests \
-	tests/SHBALI-3.tests \
-	tests/SHKNDA-1.tests \
-	$(NULL)
-DISABLED_TESTS = \
-	tests/CMAP-3.tests # Non-Unicode cmap \
-	tests/MORX-1.tests # Not implemented \
-	tests/MORX-2.tests # Not implemented \
-	tests/MORX-3.tests # Not implemented \
-	tests/MORX-4.tests # Not implemented \
-	tests/SHARAN-1.tests # Rounding difference \
-	tests/SHBALI-1.tests # Rounding difference \
-	tests/SHBALI-2.tests # Rounding difference \
-	tests/SHKNDA-2.tests # Rounding difference \
-	tests/SHKNDA-3.tests # Rounding difference \
-	$(NULL)
+include Makefile.sources
 
 -include $(top_srcdir)/git.mk
diff --git a/test/shaping/data/text-rendering-tests/Makefile.sources b/test/shaping/data/text-rendering-tests/Makefile.sources
new file mode 100644
index 000000000..913d41952
--- /dev/null
+++ b/test/shaping/data/text-rendering-tests/Makefile.sources
@@ -0,0 +1,51 @@
+TESTS = \
+	tests/AVAR-1.tests \
+	tests/CFF-1.tests \
+	tests/CFF2-1.tests \
+	tests/CFF-2.tests \
+	tests/CMAP-1.tests \
+	tests/CMAP-2.tests \
+	tests/CVAR-1.tests \
+	tests/CVAR-2.tests \
+	tests/GLYF-1.tests \
+	tests/GPOS-1.tests \
+	tests/GPOS-2.tests \
+	tests/GPOS-3.tests \
+	tests/GPOS-4.tests \
+	tests/GPOS-5.tests \
+	tests/GSUB-1.tests \
+	tests/GSUB-2.tests \
+	tests/GVAR-1.tests \
+	tests/GVAR-2.tests \
+	tests/GVAR-3.tests \
+	tests/GVAR-4.tests \
+	tests/GVAR-5.tests \
+	tests/GVAR-6.tests \
+	tests/GVAR-7.tests \
+	tests/GVAR-8.tests \
+	tests/GVAR-9.tests \
+	tests/HVAR-1.tests \
+	tests/HVAR-2.tests \
+	tests/KERN-1.tests \
+	tests/KERN-2.tests \
+	tests/MORX-5.tests \
+	tests/MORX-6.tests \
+	tests/MORX-7.tests \
+	tests/MORX-8.tests \
+	tests/MORX-9.tests \
+	tests/SHBALI-3.tests \
+	tests/SHKNDA-1.tests \
+	$(NULL)
+
+DISBALED_TESTS = \
+	tests/CMAP-3.tests \
+	tests/MORX-1.tests \
+	tests/MORX-2.tests \
+	tests/MORX-3.tests \
+	tests/MORX-4.tests \
+	tests/SHARAN-1.tests \
+	tests/SHBALI-1.tests \
+	tests/SHBALI-2.tests \
+	tests/SHKNDA-2.tests \
+	tests/SHKNDA-3.tests \
+	$(NULL)
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXEight.ttf b/test/shaping/data/text-rendering-tests/fonts/TestMORXEight.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..9255e996e3d94023a64866e376becef2187030e4
GIT binary patch
literal 2184
zcma)7Uu;uV82`@c*1IXLl(pTE1@7J5+HSCJYr7U_*%*sMWNYop0AXy@wXA4MyS2bb
zlo$d=i7|^$3nOtp81=zKi6&}%fZ)S2B#QCh%Oq+{#)F9uNMg)df9KwIVPqkmn{&_i
zedqi0`@Zv!7!f^6uaJS-LXlQ?qHg>)5!(*w(XmuCLr>91;6DK$7*C!#R(Si;i$uH(
z{fk6A8Z+(qd>V6KqWcmMNVWVH=)33*iBxW?>K6M7_A}t?lIgK1|Cs#={x9$wQqidl
zP0>E^wczDcdU8rmpX(-)u7aOG5lzLPY#Dxps0=*+I+M=k$V7-Iy@7c*3GC=cUEe69
zroi81Ff2hrKfdIf)yMALM1^|>7yll-L|jPGU}IP+AV<Snf;G4_Pl7Bpqb8}K4nn4A
z47Qu898^r>VZ^VnX-F#gMSc*nz52*T$j!D19ihBd8`^syNIOZUUV{t_^T0e0J&_Bs
zyIfRKMz#lNgo!GjMZZW<K1Dl#Hl}?-+n`yj1HLv`RNxcY$*4+ip`cN1)Ke%Fel7e^
zxTfhss5L8D$wvv)@h7%{9f6F~2weWd7vNPQs#eTOqggSJu-SZ^CGt1;!m`i9W6PKI
z3i7l3CiF~1jf$i)4^s_xyTd3+9(E)D$IxL`6K1v}*CdN%S|9#xagpC#_V98`*Tz8W
z&xjC3z<r2SMKvN*=C)ZaM#(Dvs%oxw`#QXKRkfNuMT)gtywJC6?tJdwUk*MUIecpR
zP-t-Eb-pk-+8tR}zG*u80$<2~`$VAA`+NRM-_Ae}vfWX*$DhNhi+yFZT5KM--)c0f
z_4W?0&*yR5Y9zbL<nu3|85nWy?|kRIXJ?cCcvHjvetzN7tFO(}1x;1gKTN$lY_s$`
zu>HiUV;3#pq->%_YRBg5Fnc|U+iJF`N+W=pfmx|Hg132mh=Leai|W&Iff&+QhTWN%
z$k(ttPDOF%YaEK=ct1Eh5W3vl)U<W0!?AUOEkU7n!l^jflBQJaR7NLLixbJ)-Jx(e
z7#s`-0b~^#`@^v`s%EbrOXKjb34nQamu<56)N^~*3_i{*%Jz*_j`raPqIw@5)!*Uo
z;$j)=jgmvuTdc6;v948vW7%e>sbNc9d!5?TzjKebJA8djEQfp<XPdodi(<37{M~-n
zGl79FZ9iAiB+#+4N^k*moo4hnIGyI$Yx|3I88xGRy4(o*%_3b1{m+W@V{9{hSEQ>b
zh}%lnuckWQMZJ`!44pyL<1~(Ql*2CmKs$MD*csbF4bchAjX^I)aoPsS9!SQ>g}W|J
zSy&8Ehz98(Zr75JLClQPNlM~;Og=<UhTZ?uY<WO40?%2XNMMv{7otSzG<=C@3E;>=
z+6T-hw2UI4j)6L@;fZ5T*GOua#i5mjZ4C00phcdOpmXpfbR)>PA7coW61w+$?qB6W
z#>xoWETkf~j2gPMF5ic1b<`4;D4hbj<66z0$6rJ~4PKy-wJiInhr$}2qfU%swQ|7J
zNv-%qHN+}rAj=}Ez>vh4hIAbBA=IOP#U@*{605K0pGNMJ@DabyW;N36ikFsRUbvM}
z`(9vaU!mMZs`x$?KE*A*R;$o<cLQ!9J5`ef_qe#bMPtQ&6{C=_(z}HhK)eQGzSL%9
zof0y<t+XD!0sW}<h8SU4PDb4C6(mknsfia*cs5|(Q2cZ~T~-FU_=J`4D)h8Ahrg^N
S(2#*=f|ucO4roDhng0i5gmsw!

literal 0
HcmV?d00001

diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXNine.ttf b/test/shaping/data/text-rendering-tests/fonts/TestMORXNine.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..4371df458dfc5c8efd4787bddfd14e9155c8d74e
GIT binary patch
literal 1624
zcma)6QD|Fb6#oAIHc7kAb|L9nb&MOcRv*@NHZ#;3bgd((s|{_|H9Abqnk<<lO-b(7
z4qWkJK3EXyi-_)FAP7RmF(&w+VDV*S4t)^urBmm`A}Bu0hvAy|oqKObD--;~$@$Lt
z&-u@H&b{}C0?>-rU|@eD+1Fp#mCpidfZms<OPN_r;s)(y+K2MRGbe6;(E2{@JCx=^
zE|YD0bM#m4eMX5E=<pWQ72;czJ%y4rzwIM@$=G*j2aDzD49?<f+JDmCUdqhR!ooq?
zU9`<oxiW8duIvIlH)&flnNn`B^upVK(FEwrv*oJQxQVy8|0(zPLby}T-kJPisy+4>
z3}cNReD`YfT}OX=UbJ4&*Qk8ZVsSCYSZlCHy(p$$uul@Wu{^fNgAnH;OEGshJVcz1
zy$t=3TB4^}FX|LMhaIib=vR9sLW1wLCJs-IvS$-1!z70*<SY}DUZ8GinWRZhlSnJ+
zdckIy(a(XF-GML)l9yxz>D^D=%%5~;Vi>7L!$w1b8b38w8q3b<^vdesFNy-rF(b{I
zw{?xD`G7#kAL{mp{Au-GJ*NuwtGc!xjp*$9dHZZ<jy|*l-63CCMO4`6>3P`e^F`Fv
z`Y#j5ROgu5`O=Cn=xg6Gc4Ku_Ut5o8Pw>h6V}0MVLWcB@uvQy7r9;)fvm@yBb;y4>
z><{!uA3M+!4tMw?E>gXVug8ZkoU{JEo_Z#E?DW!$iShIsx;8%bRC2rL!KKVAx>o<@
z@z~&jpX-<62V+C*QYIE>jaDFJ7~y~s2?QcWK>hgn7gN7q&whMyYV{8lt=E*Lj@H*y
zSADr|zXC0&$V8i3IG-5B!3tfp9IVOvh>M%>2#&khOT6gf7CeAUF1}Cg##b(G!>Ibr
z#Q|*719%!`%;F5Io<yF{!s0|er1bM?K8gXN3CwVBnsHg=_^z9HmY!+sBa0lW%y=FN
zj3b3n#?8<-PRZjGikx)iKcme58Q1%-xFk=lvVMVD-m(hy94ktt0vS~4jg#$+-Aj__
z1ks$$CC5D{qG<P&V^o#7S^7^AONSL=izi8JlD&>lCpaUC-F))MmJ>`IwR5ZVN^O(V
z+h>cpiPzSu8(cCtO?D^kc^&7!RGy<PEKIx0IEFB0V+(`S@|-Mk8blv|G7Wita)(t}
zRX7x>%k<{CpWr-3?&eh8EP3uu|7G@G;TgG2Ia`@l@1D}@_BABmH(3okUnJ1@gzwC~
zmRvsu_MjV2xUq^Jks?Lz3j1pj&09il4B6XQhfD{F&r8`s;l0dvUG5pp@65U0oE*(c
K&Z2#R$izRP^bzO)

literal 0
HcmV?d00001

diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-5.tests b/test/shaping/data/text-rendering-tests/tests/MORX-5.tests
new file mode 100644
index 000000000..ca8d08645
--- /dev/null
+++ b/test/shaping/data/text-rendering-tests/tests/MORX-5.tests
@@ -0,0 +1,25 @@
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0033:[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|three@2898,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0034:[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|four@2898,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0035:[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|five@2898,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0036:[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|six@2898,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0037:[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|seven@2898,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0038:[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|eight@2898,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+0038:[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|eight@3728,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+0039:[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|nine@2898,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+0039:[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|nine@3728,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+2793:[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_zero@2898,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+2793:[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_zero@3728,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+24EB:[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_one@2898,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+24EB:[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_one@3728,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+24EC:[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_two@2898,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+24EC:[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_two@3728,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0058,U+0059,U+005A,U+24EC:[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|C@2710,0|X@3540,0|Y@3904,0|Z@4236,0|one_two@4558,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+24ED:[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_three@2898,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+24ED:[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_three@3728,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0058,U+0059,U+005A,U+24ED:[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|C@2710,0|X@3540,0|Y@3904,0|Z@4236,0|one_three@4558,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+24EE:[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_four@2898,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+24EE:[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_four@3728,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0058,U+0059,U+005A,U+24EE:[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|C@2710,0|X@3540,0|Y@3904,0|Z@4236,0|one_four@4558,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0058,U+0059,U+005A,U+24EF:[P|Q@333,0|R@699,0|A@1050,0|X@1880,0|Y@2244,0|Z@2576,0|one_five@2898,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0042,U+0058,U+0059,U+005A,U+24EF:[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|X@2710,0|Y@3074,0|Z@3406,0|one_five@3728,0]
+../fonts/TestMORXFour.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0050,U+0051,U+0052,U+0041,U+0042,U+0043,U+0058,U+0059,U+005A,U+24EF:[P|Q@333,0|R@699,0|A@1050,0|B@1880,0|C@2710,0|X@3540,0|Y@3904,0|Z@4236,0|one_five@4558,0]
diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-6.tests b/test/shaping/data/text-rendering-tests/tests/MORX-6.tests
new file mode 100644
index 000000000..ff9c061a8
--- /dev/null
+++ b/test/shaping/data/text-rendering-tests/tests/MORX-6.tests
@@ -0,0 +1 @@
+../fonts/TestMORXTwo.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+004F,U+004F,U+004F,U+0041,U+0042,U+0043,U+0044,U+0045,U+0046,U+0047,U+004F,U+004F,U+004F,U+0033,U+0031,U+0034,U+0031:[O|O@418,0|O@836,0|E@1254,0|F@2084,0|A@2914,0|G@3744,0|B@4574,0|C@5404,0|D@6234,0|O@7064,0|O@7482,0|O@7900,0|three@8318,0|one@9168,0|four@10018,0|one@10868,0]
diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-7.tests b/test/shaping/data/text-rendering-tests/tests/MORX-7.tests
new file mode 100644
index 000000000..f2508486c
--- /dev/null
+++ b/test/shaping/data/text-rendering-tests/tests/MORX-7.tests
@@ -0,0 +1 @@
+../fonts/TestMORXTwo.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+004F,U+0042,U+0043,U+0044,U+0031:[B|C@830,0|D@1660,0|O@2490,0|one@2908,0]
diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-8.tests b/test/shaping/data/text-rendering-tests/tests/MORX-8.tests
new file mode 100644
index 000000000..aa0d28b51
--- /dev/null
+++ b/test/shaping/data/text-rendering-tests/tests/MORX-8.tests
@@ -0,0 +1,3 @@
+../fonts/TestMORXEight.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0030,U+0041,U+0042,U+0043:[zero|A@914,0|B@1552,0|C@2202,0]
+../fonts/TestMORXEight.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0031,U+0041,U+0042,U+0043:[one|B@914,0|C@1564,0|A@2196,0]
+../fonts/TestMORXEight.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0032,U+0041,U+0042,U+0043:[two|C@914,0|A@1546,0|B@2184,0]
diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-9.tests b/test/shaping/data/text-rendering-tests/tests/MORX-9.tests
new file mode 100644
index 000000000..a89990874
--- /dev/null
+++ b/test/shaping/data/text-rendering-tests/tests/MORX-9.tests
@@ -0,0 +1 @@
+../fonts/TestMORXNine.ttf:--font-size=1000 --ned --remove-default-ignorables --font-funcs=ft:U+0041,U+0042,U+0058,U+0041,U+0042:[B|A@650,0|X@1288,0|A@1874,0|B@2512,0]
diff --git a/test/shaping/data/text-rendering-tests/update.sh b/test/shaping/data/text-rendering-tests/update.sh
new file mode 100755
index 000000000..31960a14b
--- /dev/null
+++ b/test/shaping/data/text-rendering-tests/update.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+dir=`dirname "$0"`
+
+set -ex
+if test -d text-rendering-tests; then
+	cd text-rendering-tests
+	git pull
+	cd ..
+else
+	git clone https://github.com/unicode-org/text-rendering-tests
+fi
+
+test -d fonts && git rm -rf fonts
+test -d fonts && (echo "fonts/ dir not empty; investigate."; false)
+cp -a text-rendering-tests/fonts .
+git add fonts
+
+rmdir tests || true
+test -d tests && git rm -rf tests || true
+test -d tests && (echo "tests/ dir not empty; investigate."; false)
+mkdir tests
+
+echo "NULL =" > Makefile.sources
+echo > Makefile.sources
+echo "TESTS = \\" > Makefile.sources
+
+DISABLED="DISBALED_TESTS = \\"
+for x in text-rendering-tests/testcases/*.html; do
+	test "x$x" = xtext-rendering-tests/testcases/index.html && continue
+	out=tests/`basename "$x" .html`.tests
+	"$dir"/extract-tests.py < "$x" > "$out"
+	if grep -q "^$out$" DISABLED; then
+		DISABLED="$DISABLED
+	$out \\"
+	else
+		echo "	$out \\" >> Makefile.sources
+	fi
+done
+git add tests
+
+echo '	$(NULL)' >> Makefile.sources
+echo >> Makefile.sources
+echo "$DISABLED" >> Makefile.sources
+echo '	$(NULL)' >> Makefile.sources
+git add Makefile.sources
+
+git commit -e -m "[test/text-rendering-tests] Update from upstream"