From 5739c876d0d080e7feaefd323245702c663f33be Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 25 Oct 2018 13:23:33 -0700
Subject: [PATCH] [test] Rename some fonts

If we have duplicae font files in different directories, that would
break the oss-fuzz build currently.  So, rename some to avoid
name class with text-rendering-test.  Would be better to find
another solution.
---
 ...ORXTwentyeight.ttf => MORXTwentyeight.ttf} | Bin
 .../in-house/fonts/{TestTRAK.ttf => TRAK.tff} | Bin
 .../in-house/fonts/{TestTTC.ttc => TTC.ttc}   | Bin
 .../data/in-house/fonts/TestDFONT.dfont       | Bin 3505 -> 0 bytes
 .../data/in-house/tests/aat-morx.tests        |   2 +-
 .../data/in-house/tests/aat-trak.tests        |  22 +++++++++---------
 .../data/in-house/tests/collections.tests     |  12 +++++-----
 7 files changed, 18 insertions(+), 18 deletions(-)
 rename test/shaping/data/in-house/fonts/{TestMORXTwentyeight.ttf => MORXTwentyeight.ttf} (100%)
 rename test/shaping/data/in-house/fonts/{TestTRAK.ttf => TRAK.tff} (100%)
 rename test/shaping/data/in-house/fonts/{TestTTC.ttc => TTC.ttc} (100%)
 delete mode 100644 test/shaping/data/in-house/fonts/TestDFONT.dfont

diff --git a/test/shaping/data/in-house/fonts/TestMORXTwentyeight.ttf b/test/shaping/data/in-house/fonts/MORXTwentyeight.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/TestMORXTwentyeight.ttf
rename to test/shaping/data/in-house/fonts/MORXTwentyeight.ttf
diff --git a/test/shaping/data/in-house/fonts/TestTRAK.ttf b/test/shaping/data/in-house/fonts/TRAK.tff
similarity index 100%
rename from test/shaping/data/in-house/fonts/TestTRAK.ttf
rename to test/shaping/data/in-house/fonts/TRAK.tff
diff --git a/test/shaping/data/in-house/fonts/TestTTC.ttc b/test/shaping/data/in-house/fonts/TTC.ttc
similarity index 100%
rename from test/shaping/data/in-house/fonts/TestTTC.ttc
rename to test/shaping/data/in-house/fonts/TTC.ttc
diff --git a/test/shaping/data/in-house/fonts/TestDFONT.dfont b/test/shaping/data/in-house/fonts/TestDFONT.dfont
deleted file mode 100644
index a6ea7009be3ed3c1083254effaf54bc6fbfed685..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3505
zcmeHJPiS0482`<@O?J24G@FRUKT91=Xj-tl$<{WI_8=r#DYP3+mUt=Dx7nB7*xh~0
zzL$_h4?-(QQRu<y!9qpw<Uu_Yr1nrfiFi>19*R`_1A4GptU`<J`kS}2Y1+gZK~T|e
znVH}BXXg9nn{Q?xAOLjaffyUc*#2V_eJ4mkoOuWVnN04$;y0(S0MV07MB<T=(G2>~
zLH=p-TgE0*>0*E91wcGU{)wrIU28kIZ66>xTjZzad__6Qs<D&PwPGb;VU;+FqV3fX
z!M$8h>tn_8!t@J2y?284N6D8<j$MenIPxY<W8`<2C}@8`XnurzZ>i$XN3P&i^52qA
zl-(&Ck7Azlee&^&Jzql{cTunXsj6LZp290<sQ(dY+h21%Uw$?ICH?QEerK)j=r~AL
znVkr7!BiaDn~{e)_x_CgEbRv$ztlCT$E9mOypA+Cc2Zs>8-dhP66aV)uP;&asb=NL
zU?mM(6b>ZeU``CyO?nydAyE~_(Z<<l<uOiszB!7|>G5hr%8l)zkPJse=$XJ@YhfTe
zmL0`8bf~TJVxt`&SVzT!)G{V^m*rUw3PN1gkyCPj-Br^rVUQ8)y;-IuOk@X5j0x7o
z!_>us$a%`F28E>B+Gr53<V53_#@CI{E_`v*-e@A)*#cvZI%C?`N}^IPe1n*Te=2b=
ze+g|y>(`6jtRtR{c%M~eAxuu}?7F|Jk1Z{Zr>`%`i`Tl-^4PUG?OFuqbq0&HrRCtx
zJ9`F?99dkXif6*JWc4k^x9UoY_p!eObcN9-SoPYTeL_qwAIL*^(qO?8e%oNlC_XgU
z!reT<<^hHf5ov?l&><c-xE-D1S%bsaF1|B3f~f2>I7&Qf@J95=mko}g$7<b&P1s|d
zGV*RjtnYOdhN6sF-{&S4yy2$|me_<d23ySGCkBTQ7s}u^+#~iF+>R~6F*uBIal+sT
zy5$`PM~Mdv-iVAGGdM>4uECoyXZ0D}jkt9l!*Ef<0_vDSk<t24*oG-==a@!62C$1L
zPYZ<%ZL74%adc6Jha{z0Vzpwv7jO=>4yAMK3$(+qTU)5l6idF^Hnm-)`v-QZ{DR83
zRX^vtWiP3+t_t*?sym)jpK}VFmE&|T2r5UMp}_HcmCF&0Q&q$)<FM%m<4$q5Y!j@G
za)=S#x{#K&_J`#thE!|)p&-QD1~3_H&|~6sS`<^2WWw|hlTO{6ajR+|+22pL<-ECv
z9k+(AeR4}XmbcKd*J0~jEBerBt<sY|Ae+tSrfsIyK_y7QVai-gvtOM6ok){6HRGwO
z>nmINb-UnH?D}ElPOmtJwGwzEL4Tyx1?01!JPaYlUy+gfEUQ_TP?BZkGTIceLs=n+
zKgF1vW#w~hmK93AU-O1isp5=Zn$0Jt+)66%lnQnsHO+$Yb;0PX^>6c~cV6Zm^UQ%h
zHC@^IlBBR7`*;;cd6_2ICn=w2TTdQR`Ldf&Rcz09>Z$$vhDWm#qe*|BlW(n}<r>iM
zX+Vu5`u$#m!juU}{_9!j!W(jUJmC4#Zs1$p8N77*OJ_5iewzjKORN73&B}oVmL5Bu
zpzP-F5Xjf!80@9E5yP(>g8$I0w&V0%b6nM%b%S}JH%%V_8{X1kXo~;Nk5B44ez&u-
z&aY>M|84%>4CwC$UL%tDlLXPZ>IK&8tVszzufm(I@_wN^GnO6UxMi@{d{vTZR%ldz
Ky&}?jb$<hG{io3Y

diff --git a/test/shaping/data/in-house/tests/aat-morx.tests b/test/shaping/data/in-house/tests/aat-morx.tests
index 4153091d0..27f5bccc9 100644
--- a/test/shaping/data/in-house/tests/aat-morx.tests
+++ b/test/shaping/data/in-house/tests/aat-morx.tests
@@ -1 +1 @@
-../fonts/TestMORXTwentyeight.ttf::U+0041,U+0078,U+0045,U+0079,U+0044,U+0079,U+0079:[A_E_D=0+1394|x=0+529|y=0+510|y=5+510|y=6+510]
+../fonts/MORXTwentyeight.ttf::U+0041,U+0078,U+0045,U+0079,U+0044,U+0079,U+0079:[A_E_D=0+1394|x=0+529|y=0+510|y=5+510|y=6+510]
diff --git a/test/shaping/data/in-house/tests/aat-trak.tests b/test/shaping/data/in-house/tests/aat-trak.tests
index 3c558e60e..4bbe72939 100644
--- a/test/shaping/data/in-house/tests/aat-trak.tests
+++ b/test/shaping/data/in-house/tests/aat-trak.tests
@@ -1,11 +1,11 @@
-../fonts/TestTRAK.ttf::U+0041,U+0042,U+0043:[A.alt=0+1000|B=1+1000|C.alt=2+1000]
-../fonts/TestTRAK.ttf:--font-ptem=.5:U+0041,U+0042,U+0043:[A.alt=0@100,0+1200|B=1@100,0+1200|C.alt=2@100,0+1200]
-../fonts/TestTRAK.ttf:--font-ptem=1:U+0041,U+0042,U+0043:[A.alt=0@100,0+1200|B=1@100,0+1200|C.alt=2@100,0+1200]
-../fonts/TestTRAK.ttf:--font-ptem=2:U+0041,U+0042,U+0043:[A.alt=0@93,0+1187|B=1@93,0+1187|C.alt=2@93,0+1187]
-../fonts/TestTRAK.ttf:--font-ptem=9:U+0041,U+0042,U+0043:[A.alt=0+1000|B=1+1000|C.alt=2+1000]
-../fonts/TestTRAK.ttf:--font-ptem=24:U+0041,U+0042,U+0043:[A.alt=0@-12,0+976|B=1@-12,0+976|C.alt=2@-12,0+976]
-../fonts/TestTRAK.ttf:--font-ptem=72:U+0041,U+0042,U+0043:[A.alt=0@-50,0+900|B=1@-50,0+900|C.alt=2@-50,0+900]
-../fonts/TestTRAK.ttf:--font-ptem=144:U+0041,U+0042,U+0043:[A.alt=0@-107,0+786|B=1@-107,0+786|C.alt=2@-107,0+786]
-../fonts/TestTRAK.ttf:--font-ptem=144:U+0041,U+0042,U+0043:[A.alt=0@-107,0+786|B=1@-107,0+786|C.alt=2@-107,0+786]
-../fonts/TestTRAK.ttf:--font-ptem=144 --features=-trak:U+0041,U+0042,U+0043:[A.alt=0+1000|B=1+1000|C.alt=2+1000]
-../fonts/TestTRAK.ttf:--font-ptem=144 --features=-trak[1;3]:U+0041,U+0042,U+0043,U+0041,U+0042,U+0043:[A.alt=0@-107,0+786|B=1+1000|C.alt=2+1000|A.alt=3@-107,0+786|B=4@-107,0+786|C.alt=5@-107,0+786]
+../fonts/TRAK.ttf::U+0041,U+0042,U+0043:[A.alt=0+1000|B=1+1000|C.alt=2+1000]
+../fonts/TRAK.ttf:--font-ptem=.5:U+0041,U+0042,U+0043:[A.alt=0@100,0+1200|B=1@100,0+1200|C.alt=2@100,0+1200]
+../fonts/TRAK.ttf:--font-ptem=1:U+0041,U+0042,U+0043:[A.alt=0@100,0+1200|B=1@100,0+1200|C.alt=2@100,0+1200]
+../fonts/TRAK.ttf:--font-ptem=2:U+0041,U+0042,U+0043:[A.alt=0@93,0+1187|B=1@93,0+1187|C.alt=2@93,0+1187]
+../fonts/TRAK.ttf:--font-ptem=9:U+0041,U+0042,U+0043:[A.alt=0+1000|B=1+1000|C.alt=2+1000]
+../fonts/TRAK.ttf:--font-ptem=24:U+0041,U+0042,U+0043:[A.alt=0@-12,0+976|B=1@-12,0+976|C.alt=2@-12,0+976]
+../fonts/TRAK.ttf:--font-ptem=72:U+0041,U+0042,U+0043:[A.alt=0@-50,0+900|B=1@-50,0+900|C.alt=2@-50,0+900]
+../fonts/TRAK.ttf:--font-ptem=144:U+0041,U+0042,U+0043:[A.alt=0@-107,0+786|B=1@-107,0+786|C.alt=2@-107,0+786]
+../fonts/TRAK.ttf:--font-ptem=144:U+0041,U+0042,U+0043:[A.alt=0@-107,0+786|B=1@-107,0+786|C.alt=2@-107,0+786]
+../fonts/TRAK.ttf:--font-ptem=144 --features=-trak:U+0041,U+0042,U+0043:[A.alt=0+1000|B=1+1000|C.alt=2+1000]
+../fonts/TRAK.ttf:--font-ptem=144 --features=-trak[1;3]:U+0041,U+0042,U+0043,U+0041,U+0042,U+0043:[A.alt=0@-107,0+786|B=1+1000|C.alt=2+1000|A.alt=3@-107,0+786|B=4@-107,0+786|C.alt=5@-107,0+786]
diff --git a/test/shaping/data/in-house/tests/collections.tests b/test/shaping/data/in-house/tests/collections.tests
index 85653c543..07dac9dd4 100644
--- a/test/shaping/data/in-house/tests/collections.tests
+++ b/test/shaping/data/in-house/tests/collections.tests
@@ -1,6 +1,6 @@
-../fonts/TestDFONT.dfont:--face-index=0 --font-funcs=ot:U+2026,U+0020,U+002E:[ellipsis=0+723|space=1+250|period=2+241]
-../fonts/TestDFONT.dfont:--face-index=1 --font-funcs=ot:U+2026,U+0020,U+002E:[gid0=0+1000|gid0=1+1000|gid0=2+1000]
-../fonts/TestDFONT.dfont:--face-index=2 --font-funcs=ot:U+2026,U+0020,U+002E:[gid0=0+1000|gid0=1+1000|gid0=2+1000]
-../fonts/TestTTC.ttc:--face-index=0 --font-funcs=ot:U+2026,U+0020,U+002E:[ellipsis=0+723|space=1+250|period=2+241]
-../fonts/TestTTC.ttc:--face-index=1 --font-funcs=ot:U+2026,U+0020,U+002E:[ellipsis=0+723|space=1+250|period=2+241]
-../fonts/TestTTC.ttc:--face-index=2 --font-funcs=ot:U+2026,U+0020,U+002E:[gid0=0+1000|gid0=1+1000|gid0=2+1000]
+../fonts/DFONT.dfont:--face-index=0 --font-funcs=ot:U+2026,U+0020,U+002E:[ellipsis=0+723|space=1+250|period=2+241]
+../fonts/DFONT.dfont:--face-index=1 --font-funcs=ot:U+2026,U+0020,U+002E:[gid0=0+1000|gid0=1+1000|gid0=2+1000]
+../fonts/DFONT.dfont:--face-index=2 --font-funcs=ot:U+2026,U+0020,U+002E:[gid0=0+1000|gid0=1+1000|gid0=2+1000]
+../fonts/TTC.ttc:--face-index=0 --font-funcs=ot:U+2026,U+0020,U+002E:[ellipsis=0+723|space=1+250|period=2+241]
+../fonts/TTC.ttc:--face-index=1 --font-funcs=ot:U+2026,U+0020,U+002E:[ellipsis=0+723|space=1+250|period=2+241]
+../fonts/TTC.ttc:--face-index=2 --font-funcs=ot:U+2026,U+0020,U+002E:[gid0=0+1000|gid0=1+1000|gid0=2+1000]