[HarfBuzz] harfbuzz: Branch 'master'

Behdad Esfahbod behdad at kemper.freedesktop.org
Thu Oct 25 20:24:29 UTC 2018 

 dev/null                                           |binary
 test/shaping/data/in-house/tests/aat-morx.tests    |    2 -
 test/shaping/data/in-house/tests/aat-trak.tests    |   22 ++++++++++-----------
 test/shaping/data/in-house/tests/collections.tests |   12 +++++------
 4 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 5739c876d0d080e7feaefd323245702c663f33be
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Oct 25 13:23:33 2018 -0700

    [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.

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 a6ea7009..00000000
Binary files a/test/shaping/data/in-house/fonts/TestDFONT.dfont and /dev/null differ
diff --git a/test/shaping/data/in-house/tests/aat-morx.tests b/test/shaping/data/in-house/tests/aat-morx.tests
index 4153091d..27f5bccc 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 3c558e60..4bbe7293 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 at 100,0+1200|B=1 at 100,0+1200|C.alt=2 at 100,0+1200]
-../fonts/TestTRAK.ttf:--font-ptem=1:U+0041,U+0042,U+0043:[A.alt=0 at 100,0+1200|B=1 at 100,0+1200|C.alt=2 at 100,0+1200]
-../fonts/TestTRAK.ttf:--font-ptem=2:U+0041,U+0042,U+0043:[A.alt=0 at 93,0+1187|B=1 at 93,0+1187|C.alt=2 at 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 at -12,0+976|B=1 at -12,0+976|C.alt=2 at -12,0+976]
-../fonts/TestTRAK.ttf:--font-ptem=72:U+0041,U+0042,U+0043:[A.alt=0 at -50,0+900|B=1 at -50,0+900|C.alt=2 at -50,0+900]
-../fonts/TestTRAK.ttf:--font-ptem=144:U+0041,U+0042,U+0043:[A.alt=0 at -107,0+786|B=1 at -107,0+786|C.alt=2 at -107,0+786]
-../fonts/TestTRAK.ttf:--font-ptem=144:U+0041,U+0042,U+0043:[A.alt=0 at -107,0+786|B=1 at -107,0+786|C.alt=2 at -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 at -107,0+786|B=1+1000|C.alt=2+1000|A.alt=3 at -107,0+786|B=4 at -107,0+786|C.alt=5 at -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 at 100,0+1200|B=1 at 100,0+1200|C.alt=2 at 100,0+1200]
+../fonts/TRAK.ttf:--font-ptem=1:U+0041,U+0042,U+0043:[A.alt=0 at 100,0+1200|B=1 at 100,0+1200|C.alt=2 at 100,0+1200]
+../fonts/TRAK.ttf:--font-ptem=2:U+0041,U+0042,U+0043:[A.alt=0 at 93,0+1187|B=1 at 93,0+1187|C.alt=2 at 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 at -12,0+976|B=1 at -12,0+976|C.alt=2 at -12,0+976]
+../fonts/TRAK.ttf:--font-ptem=72:U+0041,U+0042,U+0043:[A.alt=0 at -50,0+900|B=1 at -50,0+900|C.alt=2 at -50,0+900]
+../fonts/TRAK.ttf:--font-ptem=144:U+0041,U+0042,U+0043:[A.alt=0 at -107,0+786|B=1 at -107,0+786|C.alt=2 at -107,0+786]
+../fonts/TRAK.ttf:--font-ptem=144:U+0041,U+0042,U+0043:[A.alt=0 at -107,0+786|B=1 at -107,0+786|C.alt=2 at -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 at -107,0+786|B=1+1000|C.alt=2+1000|A.alt=3 at -107,0+786|B=4 at -107,0+786|C.alt=5 at -107,0+786]
diff --git a/test/shaping/data/in-house/tests/collections.tests b/test/shaping/data/in-house/tests/collections.tests
index 85653c54..07dac9dd 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]

More information about the HarfBuzz mailing list