diff --git a/configure.ac b/configure.ac index 1f7194ed8..f68640881 100644 --- a/configure.ac +++ b/configure.ac @@ -425,11 +425,11 @@ util/Makefile test/Makefile test/api/Makefile test/fuzzing/Makefile -test/shaping/Makefile -test/shaping/data/Makefile -test/shaping/data/aots/Makefile -test/shaping/data/in-house/Makefile -test/shaping/data/text-rendering-tests/Makefile +test/shape/Makefile +test/shape/data/Makefile +test/shape/data/aots/Makefile +test/shape/data/in-house/Makefile +test/shape/data/text-rendering-tests/Makefile test/subset/Makefile test/subset/data/Makefile test/subset/data/repack_tests/Makefile diff --git a/test/Makefile.am b/test/Makefile.am index b67d707b0..01d542a00 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2,7 +2,7 @@ NULL = EXTRA_DIST = -SUBDIRS = api shaping fuzzing subset +SUBDIRS = api shape subset fuzzing EXTRA_DIST += \ meson.build \ diff --git a/test/meson.build b/test/meson.build index c3a2002fd..8b4b83f78 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,4 +1,4 @@ subdir('api') -subdir('fuzzing') -subdir('shaping') +subdir('shape') subdir('subset') +subdir('fuzzing') diff --git a/test/shaping/Makefile.am b/test/shape/Makefile.am similarity index 100% rename from test/shaping/Makefile.am rename to test/shape/Makefile.am diff --git a/test/shaping/README.md b/test/shape/README.md similarity index 100% rename from test/shaping/README.md rename to test/shape/README.md diff --git a/test/shaping/data/Makefile.am b/test/shape/data/Makefile.am similarity index 100% rename from test/shaping/data/Makefile.am rename to test/shape/data/Makefile.am diff --git a/test/shaping/data/aots/COPYING b/test/shape/data/aots/COPYING similarity index 100% rename from test/shaping/data/aots/COPYING rename to test/shape/data/aots/COPYING diff --git a/test/shaping/data/aots/Makefile.am b/test/shape/data/aots/Makefile.am similarity index 100% rename from test/shaping/data/aots/Makefile.am rename to test/shape/data/aots/Makefile.am diff --git a/test/shaping/data/aots/Makefile.sources b/test/shape/data/aots/Makefile.sources similarity index 100% rename from test/shaping/data/aots/Makefile.sources rename to test/shape/data/aots/Makefile.sources diff --git a/test/shaping/data/aots/fonts/classdef1_font1.otf b/test/shape/data/aots/fonts/classdef1_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/classdef1_font1.otf rename to test/shape/data/aots/fonts/classdef1_font1.otf diff --git a/test/shaping/data/aots/fonts/classdef1_font2.otf b/test/shape/data/aots/fonts/classdef1_font2.otf similarity index 100% rename from test/shaping/data/aots/fonts/classdef1_font2.otf rename to test/shape/data/aots/fonts/classdef1_font2.otf diff --git a/test/shaping/data/aots/fonts/classdef1_font3.otf b/test/shape/data/aots/fonts/classdef1_font3.otf similarity index 100% rename from test/shaping/data/aots/fonts/classdef1_font3.otf rename to test/shape/data/aots/fonts/classdef1_font3.otf diff --git a/test/shaping/data/aots/fonts/classdef1_font4.otf b/test/shape/data/aots/fonts/classdef1_font4.otf similarity index 100% rename from test/shaping/data/aots/fonts/classdef1_font4.otf rename to test/shape/data/aots/fonts/classdef1_font4.otf diff --git a/test/shaping/data/aots/fonts/classdef2_font1.otf b/test/shape/data/aots/fonts/classdef2_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/classdef2_font1.otf rename to test/shape/data/aots/fonts/classdef2_font1.otf diff --git a/test/shaping/data/aots/fonts/classdef2_font2.otf b/test/shape/data/aots/fonts/classdef2_font2.otf similarity index 100% rename from test/shaping/data/aots/fonts/classdef2_font2.otf rename to test/shape/data/aots/fonts/classdef2_font2.otf diff --git a/test/shaping/data/aots/fonts/classdef2_font3.otf b/test/shape/data/aots/fonts/classdef2_font3.otf similarity index 100% rename from test/shaping/data/aots/fonts/classdef2_font3.otf rename to test/shape/data/aots/fonts/classdef2_font3.otf diff --git a/test/shaping/data/aots/fonts/classdef2_font4.otf b/test/shape/data/aots/fonts/classdef2_font4.otf similarity index 100% rename from test/shaping/data/aots/fonts/classdef2_font4.otf rename to test/shape/data/aots/fonts/classdef2_font4.otf diff --git a/test/shaping/data/aots/fonts/cmap0_font1.otf b/test/shape/data/aots/fonts/cmap0_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap0_font1.otf rename to test/shape/data/aots/fonts/cmap0_font1.otf diff --git a/test/shaping/data/aots/fonts/cmap10_font1.otf b/test/shape/data/aots/fonts/cmap10_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap10_font1.otf rename to test/shape/data/aots/fonts/cmap10_font1.otf diff --git a/test/shaping/data/aots/fonts/cmap10_font2.otf b/test/shape/data/aots/fonts/cmap10_font2.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap10_font2.otf rename to test/shape/data/aots/fonts/cmap10_font2.otf diff --git a/test/shaping/data/aots/fonts/cmap12_font1.otf b/test/shape/data/aots/fonts/cmap12_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap12_font1.otf rename to test/shape/data/aots/fonts/cmap12_font1.otf diff --git a/test/shaping/data/aots/fonts/cmap14_font1.otf b/test/shape/data/aots/fonts/cmap14_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap14_font1.otf rename to test/shape/data/aots/fonts/cmap14_font1.otf diff --git a/test/shaping/data/aots/fonts/cmap2_font1.otf b/test/shape/data/aots/fonts/cmap2_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap2_font1.otf rename to test/shape/data/aots/fonts/cmap2_font1.otf diff --git a/test/shaping/data/aots/fonts/cmap4_font1.otf b/test/shape/data/aots/fonts/cmap4_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap4_font1.otf rename to test/shape/data/aots/fonts/cmap4_font1.otf diff --git a/test/shaping/data/aots/fonts/cmap4_font2.otf b/test/shape/data/aots/fonts/cmap4_font2.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap4_font2.otf rename to test/shape/data/aots/fonts/cmap4_font2.otf diff --git a/test/shaping/data/aots/fonts/cmap4_font3.otf b/test/shape/data/aots/fonts/cmap4_font3.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap4_font3.otf rename to test/shape/data/aots/fonts/cmap4_font3.otf diff --git a/test/shaping/data/aots/fonts/cmap4_font4.otf b/test/shape/data/aots/fonts/cmap4_font4.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap4_font4.otf rename to test/shape/data/aots/fonts/cmap4_font4.otf diff --git a/test/shaping/data/aots/fonts/cmap6_font1.otf b/test/shape/data/aots/fonts/cmap6_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap6_font1.otf rename to test/shape/data/aots/fonts/cmap6_font1.otf diff --git a/test/shaping/data/aots/fonts/cmap6_font2.otf b/test/shape/data/aots/fonts/cmap6_font2.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap6_font2.otf rename to test/shape/data/aots/fonts/cmap6_font2.otf diff --git a/test/shaping/data/aots/fonts/cmap8_font1.otf b/test/shape/data/aots/fonts/cmap8_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap8_font1.otf rename to test/shape/data/aots/fonts/cmap8_font1.otf diff --git a/test/shaping/data/aots/fonts/cmap_composition_font1.otf b/test/shape/data/aots/fonts/cmap_composition_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap_composition_font1.otf rename to test/shape/data/aots/fonts/cmap_composition_font1.otf diff --git a/test/shaping/data/aots/fonts/cmap_subtableselection_font1.otf b/test/shape/data/aots/fonts/cmap_subtableselection_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap_subtableselection_font1.otf rename to test/shape/data/aots/fonts/cmap_subtableselection_font1.otf diff --git a/test/shaping/data/aots/fonts/cmap_subtableselection_font2.otf b/test/shape/data/aots/fonts/cmap_subtableselection_font2.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap_subtableselection_font2.otf rename to test/shape/data/aots/fonts/cmap_subtableselection_font2.otf diff --git a/test/shaping/data/aots/fonts/cmap_subtableselection_font3.otf b/test/shape/data/aots/fonts/cmap_subtableselection_font3.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap_subtableselection_font3.otf rename to test/shape/data/aots/fonts/cmap_subtableselection_font3.otf diff --git a/test/shaping/data/aots/fonts/cmap_subtableselection_font4.otf b/test/shape/data/aots/fonts/cmap_subtableselection_font4.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap_subtableselection_font4.otf rename to test/shape/data/aots/fonts/cmap_subtableselection_font4.otf diff --git a/test/shaping/data/aots/fonts/cmap_subtableselection_font5.otf b/test/shape/data/aots/fonts/cmap_subtableselection_font5.otf similarity index 100% rename from test/shaping/data/aots/fonts/cmap_subtableselection_font5.otf rename to test/shape/data/aots/fonts/cmap_subtableselection_font5.otf diff --git a/test/shaping/data/aots/fonts/gpos1_1_lookupflag_f1.otf b/test/shape/data/aots/fonts/gpos1_1_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos1_1_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gpos1_1_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos1_1_simple_f1.otf b/test/shape/data/aots/fonts/gpos1_1_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos1_1_simple_f1.otf rename to test/shape/data/aots/fonts/gpos1_1_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos1_1_simple_f2.otf b/test/shape/data/aots/fonts/gpos1_1_simple_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos1_1_simple_f2.otf rename to test/shape/data/aots/fonts/gpos1_1_simple_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos1_1_simple_f3.otf b/test/shape/data/aots/fonts/gpos1_1_simple_f3.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos1_1_simple_f3.otf rename to test/shape/data/aots/fonts/gpos1_1_simple_f3.otf diff --git a/test/shaping/data/aots/fonts/gpos1_1_simple_f4.otf b/test/shape/data/aots/fonts/gpos1_1_simple_f4.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos1_1_simple_f4.otf rename to test/shape/data/aots/fonts/gpos1_1_simple_f4.otf diff --git a/test/shaping/data/aots/fonts/gpos1_2_font1.otf b/test/shape/data/aots/fonts/gpos1_2_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos1_2_font1.otf rename to test/shape/data/aots/fonts/gpos1_2_font1.otf diff --git a/test/shaping/data/aots/fonts/gpos1_2_font2.otf b/test/shape/data/aots/fonts/gpos1_2_font2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos1_2_font2.otf rename to test/shape/data/aots/fonts/gpos1_2_font2.otf diff --git a/test/shaping/data/aots/fonts/gpos2_1_font6.otf b/test/shape/data/aots/fonts/gpos2_1_font6.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos2_1_font6.otf rename to test/shape/data/aots/fonts/gpos2_1_font6.otf diff --git a/test/shaping/data/aots/fonts/gpos2_1_font7.otf b/test/shape/data/aots/fonts/gpos2_1_font7.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos2_1_font7.otf rename to test/shape/data/aots/fonts/gpos2_1_font7.otf diff --git a/test/shaping/data/aots/fonts/gpos2_1_lookupflag_f1.otf b/test/shape/data/aots/fonts/gpos2_1_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos2_1_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gpos2_1_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos2_1_lookupflag_f2.otf b/test/shape/data/aots/fonts/gpos2_1_lookupflag_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos2_1_lookupflag_f2.otf rename to test/shape/data/aots/fonts/gpos2_1_lookupflag_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos2_1_next_glyph_f1.otf b/test/shape/data/aots/fonts/gpos2_1_next_glyph_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos2_1_next_glyph_f1.otf rename to test/shape/data/aots/fonts/gpos2_1_next_glyph_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos2_1_next_glyph_f2.otf b/test/shape/data/aots/fonts/gpos2_1_next_glyph_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos2_1_next_glyph_f2.otf rename to test/shape/data/aots/fonts/gpos2_1_next_glyph_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos2_1_simple_f1.otf b/test/shape/data/aots/fonts/gpos2_1_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos2_1_simple_f1.otf rename to test/shape/data/aots/fonts/gpos2_1_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos2_2_font1.otf b/test/shape/data/aots/fonts/gpos2_2_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos2_2_font1.otf rename to test/shape/data/aots/fonts/gpos2_2_font1.otf diff --git a/test/shaping/data/aots/fonts/gpos2_2_font2.otf b/test/shape/data/aots/fonts/gpos2_2_font2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos2_2_font2.otf rename to test/shape/data/aots/fonts/gpos2_2_font2.otf diff --git a/test/shaping/data/aots/fonts/gpos2_2_font3.otf b/test/shape/data/aots/fonts/gpos2_2_font3.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos2_2_font3.otf rename to test/shape/data/aots/fonts/gpos2_2_font3.otf diff --git a/test/shaping/data/aots/fonts/gpos2_2_font4.otf b/test/shape/data/aots/fonts/gpos2_2_font4.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos2_2_font4.otf rename to test/shape/data/aots/fonts/gpos2_2_font4.otf diff --git a/test/shaping/data/aots/fonts/gpos2_2_font5.otf b/test/shape/data/aots/fonts/gpos2_2_font5.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos2_2_font5.otf rename to test/shape/data/aots/fonts/gpos2_2_font5.otf diff --git a/test/shaping/data/aots/fonts/gpos3_font1.otf b/test/shape/data/aots/fonts/gpos3_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos3_font1.otf rename to test/shape/data/aots/fonts/gpos3_font1.otf diff --git a/test/shaping/data/aots/fonts/gpos3_font2.otf b/test/shape/data/aots/fonts/gpos3_font2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos3_font2.otf rename to test/shape/data/aots/fonts/gpos3_font2.otf diff --git a/test/shaping/data/aots/fonts/gpos3_font3.otf b/test/shape/data/aots/fonts/gpos3_font3.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos3_font3.otf rename to test/shape/data/aots/fonts/gpos3_font3.otf diff --git a/test/shaping/data/aots/fonts/gpos4_lookupflag_f1.otf b/test/shape/data/aots/fonts/gpos4_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos4_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gpos4_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos4_lookupflag_f2.otf b/test/shape/data/aots/fonts/gpos4_lookupflag_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos4_lookupflag_f2.otf rename to test/shape/data/aots/fonts/gpos4_lookupflag_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos4_multiple_anchors_1.otf b/test/shape/data/aots/fonts/gpos4_multiple_anchors_1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos4_multiple_anchors_1.otf rename to test/shape/data/aots/fonts/gpos4_multiple_anchors_1.otf diff --git a/test/shaping/data/aots/fonts/gpos4_simple_1.otf b/test/shape/data/aots/fonts/gpos4_simple_1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos4_simple_1.otf rename to test/shape/data/aots/fonts/gpos4_simple_1.otf diff --git a/test/shaping/data/aots/fonts/gpos5_font1.otf b/test/shape/data/aots/fonts/gpos5_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos5_font1.otf rename to test/shape/data/aots/fonts/gpos5_font1.otf diff --git a/test/shaping/data/aots/fonts/gpos6_font1.otf b/test/shape/data/aots/fonts/gpos6_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos6_font1.otf rename to test/shape/data/aots/fonts/gpos6_font1.otf diff --git a/test/shaping/data/aots/fonts/gpos7_1_font1.otf b/test/shape/data/aots/fonts/gpos7_1_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos7_1_font1.otf rename to test/shape/data/aots/fonts/gpos7_1_font1.otf diff --git a/test/shaping/data/aots/fonts/gpos9_font1.otf b/test/shape/data/aots/fonts/gpos9_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos9_font1.otf rename to test/shape/data/aots/fonts/gpos9_font1.otf diff --git a/test/shaping/data/aots/fonts/gpos9_font2.otf b/test/shape/data/aots/fonts/gpos9_font2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos9_font2.otf rename to test/shape/data/aots/fonts/gpos9_font2.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f1.otf b/test/shape/data/aots/fonts/gpos_chaining1_boundary_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining1_boundary_f1.otf rename to test/shape/data/aots/fonts/gpos_chaining1_boundary_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f2.otf b/test/shape/data/aots/fonts/gpos_chaining1_boundary_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining1_boundary_f2.otf rename to test/shape/data/aots/fonts/gpos_chaining1_boundary_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f3.otf b/test/shape/data/aots/fonts/gpos_chaining1_boundary_f3.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining1_boundary_f3.otf rename to test/shape/data/aots/fonts/gpos_chaining1_boundary_f3.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f4.otf b/test/shape/data/aots/fonts/gpos_chaining1_boundary_f4.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining1_boundary_f4.otf rename to test/shape/data/aots/fonts/gpos_chaining1_boundary_f4.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining1_lookupflag_f1.otf b/test/shape/data/aots/fonts/gpos_chaining1_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining1_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gpos_chaining1_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining1_multiple_subrules_f1.otf b/test/shape/data/aots/fonts/gpos_chaining1_multiple_subrules_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining1_multiple_subrules_f1.otf rename to test/shape/data/aots/fonts/gpos_chaining1_multiple_subrules_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining1_multiple_subrules_f2.otf b/test/shape/data/aots/fonts/gpos_chaining1_multiple_subrules_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining1_multiple_subrules_f2.otf rename to test/shape/data/aots/fonts/gpos_chaining1_multiple_subrules_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining1_next_glyph_f1.otf b/test/shape/data/aots/fonts/gpos_chaining1_next_glyph_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining1_next_glyph_f1.otf rename to test/shape/data/aots/fonts/gpos_chaining1_next_glyph_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining1_simple_f1.otf b/test/shape/data/aots/fonts/gpos_chaining1_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining1_simple_f1.otf rename to test/shape/data/aots/fonts/gpos_chaining1_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining1_simple_f2.otf b/test/shape/data/aots/fonts/gpos_chaining1_simple_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining1_simple_f2.otf rename to test/shape/data/aots/fonts/gpos_chaining1_simple_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining1_successive_f1.otf b/test/shape/data/aots/fonts/gpos_chaining1_successive_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining1_successive_f1.otf rename to test/shape/data/aots/fonts/gpos_chaining1_successive_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f1.otf b/test/shape/data/aots/fonts/gpos_chaining2_boundary_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining2_boundary_f1.otf rename to test/shape/data/aots/fonts/gpos_chaining2_boundary_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f2.otf b/test/shape/data/aots/fonts/gpos_chaining2_boundary_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining2_boundary_f2.otf rename to test/shape/data/aots/fonts/gpos_chaining2_boundary_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f3.otf b/test/shape/data/aots/fonts/gpos_chaining2_boundary_f3.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining2_boundary_f3.otf rename to test/shape/data/aots/fonts/gpos_chaining2_boundary_f3.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f4.otf b/test/shape/data/aots/fonts/gpos_chaining2_boundary_f4.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining2_boundary_f4.otf rename to test/shape/data/aots/fonts/gpos_chaining2_boundary_f4.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining2_lookupflag_f1.otf b/test/shape/data/aots/fonts/gpos_chaining2_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining2_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gpos_chaining2_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining2_multiple_subrules_f1.otf b/test/shape/data/aots/fonts/gpos_chaining2_multiple_subrules_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining2_multiple_subrules_f1.otf rename to test/shape/data/aots/fonts/gpos_chaining2_multiple_subrules_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining2_multiple_subrules_f2.otf b/test/shape/data/aots/fonts/gpos_chaining2_multiple_subrules_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining2_multiple_subrules_f2.otf rename to test/shape/data/aots/fonts/gpos_chaining2_multiple_subrules_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining2_next_glyph_f1.otf b/test/shape/data/aots/fonts/gpos_chaining2_next_glyph_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining2_next_glyph_f1.otf rename to test/shape/data/aots/fonts/gpos_chaining2_next_glyph_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining2_simple_f1.otf b/test/shape/data/aots/fonts/gpos_chaining2_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining2_simple_f1.otf rename to test/shape/data/aots/fonts/gpos_chaining2_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining2_simple_f2.otf b/test/shape/data/aots/fonts/gpos_chaining2_simple_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining2_simple_f2.otf rename to test/shape/data/aots/fonts/gpos_chaining2_simple_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining2_successive_f1.otf b/test/shape/data/aots/fonts/gpos_chaining2_successive_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining2_successive_f1.otf rename to test/shape/data/aots/fonts/gpos_chaining2_successive_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f1.otf b/test/shape/data/aots/fonts/gpos_chaining3_boundary_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining3_boundary_f1.otf rename to test/shape/data/aots/fonts/gpos_chaining3_boundary_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f2.otf b/test/shape/data/aots/fonts/gpos_chaining3_boundary_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining3_boundary_f2.otf rename to test/shape/data/aots/fonts/gpos_chaining3_boundary_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f3.otf b/test/shape/data/aots/fonts/gpos_chaining3_boundary_f3.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining3_boundary_f3.otf rename to test/shape/data/aots/fonts/gpos_chaining3_boundary_f3.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f4.otf b/test/shape/data/aots/fonts/gpos_chaining3_boundary_f4.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining3_boundary_f4.otf rename to test/shape/data/aots/fonts/gpos_chaining3_boundary_f4.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining3_lookupflag_f1.otf b/test/shape/data/aots/fonts/gpos_chaining3_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining3_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gpos_chaining3_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining3_next_glyph_f1.otf b/test/shape/data/aots/fonts/gpos_chaining3_next_glyph_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining3_next_glyph_f1.otf rename to test/shape/data/aots/fonts/gpos_chaining3_next_glyph_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining3_simple_f1.otf b/test/shape/data/aots/fonts/gpos_chaining3_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining3_simple_f1.otf rename to test/shape/data/aots/fonts/gpos_chaining3_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining3_simple_f2.otf b/test/shape/data/aots/fonts/gpos_chaining3_simple_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining3_simple_f2.otf rename to test/shape/data/aots/fonts/gpos_chaining3_simple_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_chaining3_successive_f1.otf b/test/shape/data/aots/fonts/gpos_chaining3_successive_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_chaining3_successive_f1.otf rename to test/shape/data/aots/fonts/gpos_chaining3_successive_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context1_boundary_f1.otf b/test/shape/data/aots/fonts/gpos_context1_boundary_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context1_boundary_f1.otf rename to test/shape/data/aots/fonts/gpos_context1_boundary_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context1_boundary_f2.otf b/test/shape/data/aots/fonts/gpos_context1_boundary_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context1_boundary_f2.otf rename to test/shape/data/aots/fonts/gpos_context1_boundary_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_context1_expansion_f1.otf b/test/shape/data/aots/fonts/gpos_context1_expansion_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context1_expansion_f1.otf rename to test/shape/data/aots/fonts/gpos_context1_expansion_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context1_lookupflag_f1.otf b/test/shape/data/aots/fonts/gpos_context1_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context1_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gpos_context1_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context1_lookupflag_f2.otf b/test/shape/data/aots/fonts/gpos_context1_lookupflag_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context1_lookupflag_f2.otf rename to test/shape/data/aots/fonts/gpos_context1_lookupflag_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_context1_multiple_subrules_f1.otf b/test/shape/data/aots/fonts/gpos_context1_multiple_subrules_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context1_multiple_subrules_f1.otf rename to test/shape/data/aots/fonts/gpos_context1_multiple_subrules_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context1_multiple_subrules_f2.otf b/test/shape/data/aots/fonts/gpos_context1_multiple_subrules_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context1_multiple_subrules_f2.otf rename to test/shape/data/aots/fonts/gpos_context1_multiple_subrules_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_context1_next_glyph_f1.otf b/test/shape/data/aots/fonts/gpos_context1_next_glyph_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context1_next_glyph_f1.otf rename to test/shape/data/aots/fonts/gpos_context1_next_glyph_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context1_simple_f1.otf b/test/shape/data/aots/fonts/gpos_context1_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context1_simple_f1.otf rename to test/shape/data/aots/fonts/gpos_context1_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context1_simple_f2.otf b/test/shape/data/aots/fonts/gpos_context1_simple_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context1_simple_f2.otf rename to test/shape/data/aots/fonts/gpos_context1_simple_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_context1_successive_f1.otf b/test/shape/data/aots/fonts/gpos_context1_successive_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context1_successive_f1.otf rename to test/shape/data/aots/fonts/gpos_context1_successive_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context2_boundary_f1.otf b/test/shape/data/aots/fonts/gpos_context2_boundary_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context2_boundary_f1.otf rename to test/shape/data/aots/fonts/gpos_context2_boundary_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context2_boundary_f2.otf b/test/shape/data/aots/fonts/gpos_context2_boundary_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context2_boundary_f2.otf rename to test/shape/data/aots/fonts/gpos_context2_boundary_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_context2_classes_f1.otf b/test/shape/data/aots/fonts/gpos_context2_classes_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context2_classes_f1.otf rename to test/shape/data/aots/fonts/gpos_context2_classes_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context2_classes_f2.otf b/test/shape/data/aots/fonts/gpos_context2_classes_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context2_classes_f2.otf rename to test/shape/data/aots/fonts/gpos_context2_classes_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_context2_expansion_f1.otf b/test/shape/data/aots/fonts/gpos_context2_expansion_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context2_expansion_f1.otf rename to test/shape/data/aots/fonts/gpos_context2_expansion_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context2_lookupflag_f1.otf b/test/shape/data/aots/fonts/gpos_context2_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context2_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gpos_context2_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context2_lookupflag_f2.otf b/test/shape/data/aots/fonts/gpos_context2_lookupflag_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context2_lookupflag_f2.otf rename to test/shape/data/aots/fonts/gpos_context2_lookupflag_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_context2_multiple_subrules_f1.otf b/test/shape/data/aots/fonts/gpos_context2_multiple_subrules_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context2_multiple_subrules_f1.otf rename to test/shape/data/aots/fonts/gpos_context2_multiple_subrules_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context2_multiple_subrules_f2.otf b/test/shape/data/aots/fonts/gpos_context2_multiple_subrules_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context2_multiple_subrules_f2.otf rename to test/shape/data/aots/fonts/gpos_context2_multiple_subrules_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_context2_next_glyph_f1.otf b/test/shape/data/aots/fonts/gpos_context2_next_glyph_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context2_next_glyph_f1.otf rename to test/shape/data/aots/fonts/gpos_context2_next_glyph_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context2_simple_f1.otf b/test/shape/data/aots/fonts/gpos_context2_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context2_simple_f1.otf rename to test/shape/data/aots/fonts/gpos_context2_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context2_simple_f2.otf b/test/shape/data/aots/fonts/gpos_context2_simple_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context2_simple_f2.otf rename to test/shape/data/aots/fonts/gpos_context2_simple_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_context2_successive_f1.otf b/test/shape/data/aots/fonts/gpos_context2_successive_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context2_successive_f1.otf rename to test/shape/data/aots/fonts/gpos_context2_successive_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context3_boundary_f1.otf b/test/shape/data/aots/fonts/gpos_context3_boundary_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context3_boundary_f1.otf rename to test/shape/data/aots/fonts/gpos_context3_boundary_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context3_boundary_f2.otf b/test/shape/data/aots/fonts/gpos_context3_boundary_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context3_boundary_f2.otf rename to test/shape/data/aots/fonts/gpos_context3_boundary_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_context3_lookupflag_f1.otf b/test/shape/data/aots/fonts/gpos_context3_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context3_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gpos_context3_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context3_lookupflag_f2.otf b/test/shape/data/aots/fonts/gpos_context3_lookupflag_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context3_lookupflag_f2.otf rename to test/shape/data/aots/fonts/gpos_context3_lookupflag_f2.otf diff --git a/test/shaping/data/aots/fonts/gpos_context3_next_glyph_f1.otf b/test/shape/data/aots/fonts/gpos_context3_next_glyph_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context3_next_glyph_f1.otf rename to test/shape/data/aots/fonts/gpos_context3_next_glyph_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context3_simple_f1.otf b/test/shape/data/aots/fonts/gpos_context3_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context3_simple_f1.otf rename to test/shape/data/aots/fonts/gpos_context3_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gpos_context3_successive_f1.otf b/test/shape/data/aots/fonts/gpos_context3_successive_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gpos_context3_successive_f1.otf rename to test/shape/data/aots/fonts/gpos_context3_successive_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub1_1_lookupflag_f1.otf b/test/shape/data/aots/fonts/gsub1_1_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub1_1_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gsub1_1_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub1_1_modulo_f1.otf b/test/shape/data/aots/fonts/gsub1_1_modulo_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub1_1_modulo_f1.otf rename to test/shape/data/aots/fonts/gsub1_1_modulo_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub1_1_simple_f1.otf b/test/shape/data/aots/fonts/gsub1_1_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub1_1_simple_f1.otf rename to test/shape/data/aots/fonts/gsub1_1_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub1_2_lookupflag_f1.otf b/test/shape/data/aots/fonts/gsub1_2_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub1_2_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gsub1_2_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub1_2_simple_f1.otf b/test/shape/data/aots/fonts/gsub1_2_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub1_2_simple_f1.otf rename to test/shape/data/aots/fonts/gsub1_2_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub2_1_lookupflag_f1.otf b/test/shape/data/aots/fonts/gsub2_1_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub2_1_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gsub2_1_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub2_1_multiple_sequences_f1.otf b/test/shape/data/aots/fonts/gsub2_1_multiple_sequences_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub2_1_multiple_sequences_f1.otf rename to test/shape/data/aots/fonts/gsub2_1_multiple_sequences_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub2_1_simple_f1.otf b/test/shape/data/aots/fonts/gsub2_1_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub2_1_simple_f1.otf rename to test/shape/data/aots/fonts/gsub2_1_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub3_1_lookupflag_f1.otf b/test/shape/data/aots/fonts/gsub3_1_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub3_1_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gsub3_1_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub3_1_multiple_f1.otf b/test/shape/data/aots/fonts/gsub3_1_multiple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub3_1_multiple_f1.otf rename to test/shape/data/aots/fonts/gsub3_1_multiple_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub3_1_simple_f1.otf b/test/shape/data/aots/fonts/gsub3_1_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub3_1_simple_f1.otf rename to test/shape/data/aots/fonts/gsub3_1_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub4_1_lookupflag_f1.otf b/test/shape/data/aots/fonts/gsub4_1_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub4_1_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gsub4_1_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub4_1_multiple_ligatures_f1.otf b/test/shape/data/aots/fonts/gsub4_1_multiple_ligatures_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub4_1_multiple_ligatures_f1.otf rename to test/shape/data/aots/fonts/gsub4_1_multiple_ligatures_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub4_1_multiple_ligatures_f2.otf b/test/shape/data/aots/fonts/gsub4_1_multiple_ligatures_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub4_1_multiple_ligatures_f2.otf rename to test/shape/data/aots/fonts/gsub4_1_multiple_ligatures_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub4_1_multiple_ligsets_f1.otf b/test/shape/data/aots/fonts/gsub4_1_multiple_ligsets_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub4_1_multiple_ligsets_f1.otf rename to test/shape/data/aots/fonts/gsub4_1_multiple_ligsets_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub4_1_simple_f1.otf b/test/shape/data/aots/fonts/gsub4_1_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub4_1_simple_f1.otf rename to test/shape/data/aots/fonts/gsub4_1_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub7_font1.otf b/test/shape/data/aots/fonts/gsub7_font1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub7_font1.otf rename to test/shape/data/aots/fonts/gsub7_font1.otf diff --git a/test/shaping/data/aots/fonts/gsub7_font2.otf b/test/shape/data/aots/fonts/gsub7_font2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub7_font2.otf rename to test/shape/data/aots/fonts/gsub7_font2.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining1_boundary_f1.otf b/test/shape/data/aots/fonts/gsub_chaining1_boundary_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining1_boundary_f1.otf rename to test/shape/data/aots/fonts/gsub_chaining1_boundary_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining1_boundary_f2.otf b/test/shape/data/aots/fonts/gsub_chaining1_boundary_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining1_boundary_f2.otf rename to test/shape/data/aots/fonts/gsub_chaining1_boundary_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining1_boundary_f3.otf b/test/shape/data/aots/fonts/gsub_chaining1_boundary_f3.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining1_boundary_f3.otf rename to test/shape/data/aots/fonts/gsub_chaining1_boundary_f3.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining1_boundary_f4.otf b/test/shape/data/aots/fonts/gsub_chaining1_boundary_f4.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining1_boundary_f4.otf rename to test/shape/data/aots/fonts/gsub_chaining1_boundary_f4.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining1_lookupflag_f1.otf b/test/shape/data/aots/fonts/gsub_chaining1_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining1_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gsub_chaining1_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining1_multiple_subrules_f1.otf b/test/shape/data/aots/fonts/gsub_chaining1_multiple_subrules_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining1_multiple_subrules_f1.otf rename to test/shape/data/aots/fonts/gsub_chaining1_multiple_subrules_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining1_multiple_subrules_f2.otf b/test/shape/data/aots/fonts/gsub_chaining1_multiple_subrules_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining1_multiple_subrules_f2.otf rename to test/shape/data/aots/fonts/gsub_chaining1_multiple_subrules_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining1_next_glyph_f1.otf b/test/shape/data/aots/fonts/gsub_chaining1_next_glyph_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining1_next_glyph_f1.otf rename to test/shape/data/aots/fonts/gsub_chaining1_next_glyph_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining1_simple_f1.otf b/test/shape/data/aots/fonts/gsub_chaining1_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining1_simple_f1.otf rename to test/shape/data/aots/fonts/gsub_chaining1_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining1_simple_f2.otf b/test/shape/data/aots/fonts/gsub_chaining1_simple_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining1_simple_f2.otf rename to test/shape/data/aots/fonts/gsub_chaining1_simple_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining1_successive_f1.otf b/test/shape/data/aots/fonts/gsub_chaining1_successive_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining1_successive_f1.otf rename to test/shape/data/aots/fonts/gsub_chaining1_successive_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining2_boundary_f1.otf b/test/shape/data/aots/fonts/gsub_chaining2_boundary_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining2_boundary_f1.otf rename to test/shape/data/aots/fonts/gsub_chaining2_boundary_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining2_boundary_f2.otf b/test/shape/data/aots/fonts/gsub_chaining2_boundary_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining2_boundary_f2.otf rename to test/shape/data/aots/fonts/gsub_chaining2_boundary_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining2_boundary_f3.otf b/test/shape/data/aots/fonts/gsub_chaining2_boundary_f3.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining2_boundary_f3.otf rename to test/shape/data/aots/fonts/gsub_chaining2_boundary_f3.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining2_boundary_f4.otf b/test/shape/data/aots/fonts/gsub_chaining2_boundary_f4.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining2_boundary_f4.otf rename to test/shape/data/aots/fonts/gsub_chaining2_boundary_f4.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining2_lookupflag_f1.otf b/test/shape/data/aots/fonts/gsub_chaining2_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining2_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gsub_chaining2_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining2_multiple_subrules_f1.otf b/test/shape/data/aots/fonts/gsub_chaining2_multiple_subrules_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining2_multiple_subrules_f1.otf rename to test/shape/data/aots/fonts/gsub_chaining2_multiple_subrules_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining2_multiple_subrules_f2.otf b/test/shape/data/aots/fonts/gsub_chaining2_multiple_subrules_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining2_multiple_subrules_f2.otf rename to test/shape/data/aots/fonts/gsub_chaining2_multiple_subrules_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining2_next_glyph_f1.otf b/test/shape/data/aots/fonts/gsub_chaining2_next_glyph_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining2_next_glyph_f1.otf rename to test/shape/data/aots/fonts/gsub_chaining2_next_glyph_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining2_simple_f1.otf b/test/shape/data/aots/fonts/gsub_chaining2_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining2_simple_f1.otf rename to test/shape/data/aots/fonts/gsub_chaining2_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining2_simple_f2.otf b/test/shape/data/aots/fonts/gsub_chaining2_simple_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining2_simple_f2.otf rename to test/shape/data/aots/fonts/gsub_chaining2_simple_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining2_successive_f1.otf b/test/shape/data/aots/fonts/gsub_chaining2_successive_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining2_successive_f1.otf rename to test/shape/data/aots/fonts/gsub_chaining2_successive_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining3_boundary_f1.otf b/test/shape/data/aots/fonts/gsub_chaining3_boundary_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining3_boundary_f1.otf rename to test/shape/data/aots/fonts/gsub_chaining3_boundary_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining3_boundary_f2.otf b/test/shape/data/aots/fonts/gsub_chaining3_boundary_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining3_boundary_f2.otf rename to test/shape/data/aots/fonts/gsub_chaining3_boundary_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining3_boundary_f3.otf b/test/shape/data/aots/fonts/gsub_chaining3_boundary_f3.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining3_boundary_f3.otf rename to test/shape/data/aots/fonts/gsub_chaining3_boundary_f3.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining3_boundary_f4.otf b/test/shape/data/aots/fonts/gsub_chaining3_boundary_f4.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining3_boundary_f4.otf rename to test/shape/data/aots/fonts/gsub_chaining3_boundary_f4.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining3_lookupflag_f1.otf b/test/shape/data/aots/fonts/gsub_chaining3_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining3_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gsub_chaining3_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining3_next_glyph_f1.otf b/test/shape/data/aots/fonts/gsub_chaining3_next_glyph_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining3_next_glyph_f1.otf rename to test/shape/data/aots/fonts/gsub_chaining3_next_glyph_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining3_simple_f1.otf b/test/shape/data/aots/fonts/gsub_chaining3_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining3_simple_f1.otf rename to test/shape/data/aots/fonts/gsub_chaining3_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining3_simple_f2.otf b/test/shape/data/aots/fonts/gsub_chaining3_simple_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining3_simple_f2.otf rename to test/shape/data/aots/fonts/gsub_chaining3_simple_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_chaining3_successive_f1.otf b/test/shape/data/aots/fonts/gsub_chaining3_successive_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_chaining3_successive_f1.otf rename to test/shape/data/aots/fonts/gsub_chaining3_successive_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context1_boundary_f1.otf b/test/shape/data/aots/fonts/gsub_context1_boundary_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context1_boundary_f1.otf rename to test/shape/data/aots/fonts/gsub_context1_boundary_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context1_boundary_f2.otf b/test/shape/data/aots/fonts/gsub_context1_boundary_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context1_boundary_f2.otf rename to test/shape/data/aots/fonts/gsub_context1_boundary_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_context1_expansion_f1.otf b/test/shape/data/aots/fonts/gsub_context1_expansion_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context1_expansion_f1.otf rename to test/shape/data/aots/fonts/gsub_context1_expansion_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context1_lookupflag_f1.otf b/test/shape/data/aots/fonts/gsub_context1_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context1_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gsub_context1_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context1_lookupflag_f2.otf b/test/shape/data/aots/fonts/gsub_context1_lookupflag_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context1_lookupflag_f2.otf rename to test/shape/data/aots/fonts/gsub_context1_lookupflag_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_context1_multiple_subrules_f1.otf b/test/shape/data/aots/fonts/gsub_context1_multiple_subrules_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context1_multiple_subrules_f1.otf rename to test/shape/data/aots/fonts/gsub_context1_multiple_subrules_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context1_multiple_subrules_f2.otf b/test/shape/data/aots/fonts/gsub_context1_multiple_subrules_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context1_multiple_subrules_f2.otf rename to test/shape/data/aots/fonts/gsub_context1_multiple_subrules_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_context1_next_glyph_f1.otf b/test/shape/data/aots/fonts/gsub_context1_next_glyph_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context1_next_glyph_f1.otf rename to test/shape/data/aots/fonts/gsub_context1_next_glyph_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context1_simple_f1.otf b/test/shape/data/aots/fonts/gsub_context1_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context1_simple_f1.otf rename to test/shape/data/aots/fonts/gsub_context1_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context1_simple_f2.otf b/test/shape/data/aots/fonts/gsub_context1_simple_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context1_simple_f2.otf rename to test/shape/data/aots/fonts/gsub_context1_simple_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_context1_successive_f1.otf b/test/shape/data/aots/fonts/gsub_context1_successive_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context1_successive_f1.otf rename to test/shape/data/aots/fonts/gsub_context1_successive_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context2_boundary_f1.otf b/test/shape/data/aots/fonts/gsub_context2_boundary_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context2_boundary_f1.otf rename to test/shape/data/aots/fonts/gsub_context2_boundary_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context2_boundary_f2.otf b/test/shape/data/aots/fonts/gsub_context2_boundary_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context2_boundary_f2.otf rename to test/shape/data/aots/fonts/gsub_context2_boundary_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_context2_classes_f1.otf b/test/shape/data/aots/fonts/gsub_context2_classes_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context2_classes_f1.otf rename to test/shape/data/aots/fonts/gsub_context2_classes_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context2_classes_f2.otf b/test/shape/data/aots/fonts/gsub_context2_classes_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context2_classes_f2.otf rename to test/shape/data/aots/fonts/gsub_context2_classes_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_context2_expansion_f1.otf b/test/shape/data/aots/fonts/gsub_context2_expansion_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context2_expansion_f1.otf rename to test/shape/data/aots/fonts/gsub_context2_expansion_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context2_lookupflag_f1.otf b/test/shape/data/aots/fonts/gsub_context2_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context2_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gsub_context2_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context2_lookupflag_f2.otf b/test/shape/data/aots/fonts/gsub_context2_lookupflag_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context2_lookupflag_f2.otf rename to test/shape/data/aots/fonts/gsub_context2_lookupflag_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_context2_multiple_subrules_f1.otf b/test/shape/data/aots/fonts/gsub_context2_multiple_subrules_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context2_multiple_subrules_f1.otf rename to test/shape/data/aots/fonts/gsub_context2_multiple_subrules_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context2_multiple_subrules_f2.otf b/test/shape/data/aots/fonts/gsub_context2_multiple_subrules_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context2_multiple_subrules_f2.otf rename to test/shape/data/aots/fonts/gsub_context2_multiple_subrules_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_context2_next_glyph_f1.otf b/test/shape/data/aots/fonts/gsub_context2_next_glyph_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context2_next_glyph_f1.otf rename to test/shape/data/aots/fonts/gsub_context2_next_glyph_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context2_simple_f1.otf b/test/shape/data/aots/fonts/gsub_context2_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context2_simple_f1.otf rename to test/shape/data/aots/fonts/gsub_context2_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context2_simple_f2.otf b/test/shape/data/aots/fonts/gsub_context2_simple_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context2_simple_f2.otf rename to test/shape/data/aots/fonts/gsub_context2_simple_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_context2_successive_f1.otf b/test/shape/data/aots/fonts/gsub_context2_successive_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context2_successive_f1.otf rename to test/shape/data/aots/fonts/gsub_context2_successive_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context3_boundary_f1.otf b/test/shape/data/aots/fonts/gsub_context3_boundary_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context3_boundary_f1.otf rename to test/shape/data/aots/fonts/gsub_context3_boundary_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context3_boundary_f2.otf b/test/shape/data/aots/fonts/gsub_context3_boundary_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context3_boundary_f2.otf rename to test/shape/data/aots/fonts/gsub_context3_boundary_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_context3_lookupflag_f1.otf b/test/shape/data/aots/fonts/gsub_context3_lookupflag_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context3_lookupflag_f1.otf rename to test/shape/data/aots/fonts/gsub_context3_lookupflag_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context3_lookupflag_f2.otf b/test/shape/data/aots/fonts/gsub_context3_lookupflag_f2.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context3_lookupflag_f2.otf rename to test/shape/data/aots/fonts/gsub_context3_lookupflag_f2.otf diff --git a/test/shaping/data/aots/fonts/gsub_context3_next_glyph_f1.otf b/test/shape/data/aots/fonts/gsub_context3_next_glyph_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context3_next_glyph_f1.otf rename to test/shape/data/aots/fonts/gsub_context3_next_glyph_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context3_simple_f1.otf b/test/shape/data/aots/fonts/gsub_context3_simple_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context3_simple_f1.otf rename to test/shape/data/aots/fonts/gsub_context3_simple_f1.otf diff --git a/test/shaping/data/aots/fonts/gsub_context3_successive_f1.otf b/test/shape/data/aots/fonts/gsub_context3_successive_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/gsub_context3_successive_f1.otf rename to test/shape/data/aots/fonts/gsub_context3_successive_f1.otf diff --git a/test/shaping/data/aots/fonts/lookupflag_ignore_attach_f1.otf b/test/shape/data/aots/fonts/lookupflag_ignore_attach_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/lookupflag_ignore_attach_f1.otf rename to test/shape/data/aots/fonts/lookupflag_ignore_attach_f1.otf diff --git a/test/shaping/data/aots/fonts/lookupflag_ignore_base_f1.otf b/test/shape/data/aots/fonts/lookupflag_ignore_base_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/lookupflag_ignore_base_f1.otf rename to test/shape/data/aots/fonts/lookupflag_ignore_base_f1.otf diff --git a/test/shaping/data/aots/fonts/lookupflag_ignore_combination_f1.otf b/test/shape/data/aots/fonts/lookupflag_ignore_combination_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/lookupflag_ignore_combination_f1.otf rename to test/shape/data/aots/fonts/lookupflag_ignore_combination_f1.otf diff --git a/test/shaping/data/aots/fonts/lookupflag_ignore_ligatures_f1.otf b/test/shape/data/aots/fonts/lookupflag_ignore_ligatures_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/lookupflag_ignore_ligatures_f1.otf rename to test/shape/data/aots/fonts/lookupflag_ignore_ligatures_f1.otf diff --git a/test/shaping/data/aots/fonts/lookupflag_ignore_marks_f1.otf b/test/shape/data/aots/fonts/lookupflag_ignore_marks_f1.otf similarity index 100% rename from test/shaping/data/aots/fonts/lookupflag_ignore_marks_f1.otf rename to test/shape/data/aots/fonts/lookupflag_ignore_marks_f1.otf diff --git a/test/shaping/data/aots/hb-aots-tester.cpp b/test/shape/data/aots/hb-aots-tester.cpp similarity index 100% rename from test/shaping/data/aots/hb-aots-tester.cpp rename to test/shape/data/aots/hb-aots-tester.cpp diff --git a/test/shaping/data/aots/meson.build b/test/shape/data/aots/meson.build similarity index 100% rename from test/shaping/data/aots/meson.build rename to test/shape/data/aots/meson.build diff --git a/test/shaping/data/aots/tests/classdef1.tests b/test/shape/data/aots/tests/classdef1.tests similarity index 100% rename from test/shaping/data/aots/tests/classdef1.tests rename to test/shape/data/aots/tests/classdef1.tests diff --git a/test/shaping/data/aots/tests/classdef1_empty.tests b/test/shape/data/aots/tests/classdef1_empty.tests similarity index 100% rename from test/shaping/data/aots/tests/classdef1_empty.tests rename to test/shape/data/aots/tests/classdef1_empty.tests diff --git a/test/shaping/data/aots/tests/classdef1_multiple.tests b/test/shape/data/aots/tests/classdef1_multiple.tests similarity index 100% rename from test/shaping/data/aots/tests/classdef1_multiple.tests rename to test/shape/data/aots/tests/classdef1_multiple.tests diff --git a/test/shaping/data/aots/tests/classdef1_single.tests b/test/shape/data/aots/tests/classdef1_single.tests similarity index 100% rename from test/shaping/data/aots/tests/classdef1_single.tests rename to test/shape/data/aots/tests/classdef1_single.tests diff --git a/test/shaping/data/aots/tests/classdef2.tests b/test/shape/data/aots/tests/classdef2.tests similarity index 100% rename from test/shaping/data/aots/tests/classdef2.tests rename to test/shape/data/aots/tests/classdef2.tests diff --git a/test/shaping/data/aots/tests/classdef2_empty.tests b/test/shape/data/aots/tests/classdef2_empty.tests similarity index 100% rename from test/shaping/data/aots/tests/classdef2_empty.tests rename to test/shape/data/aots/tests/classdef2_empty.tests diff --git a/test/shaping/data/aots/tests/classdef2_multiple.tests b/test/shape/data/aots/tests/classdef2_multiple.tests similarity index 100% rename from test/shaping/data/aots/tests/classdef2_multiple.tests rename to test/shape/data/aots/tests/classdef2_multiple.tests diff --git a/test/shaping/data/aots/tests/classdef2_single.tests b/test/shape/data/aots/tests/classdef2_single.tests similarity index 100% rename from test/shaping/data/aots/tests/classdef2_single.tests rename to test/shape/data/aots/tests/classdef2_single.tests diff --git a/test/shaping/data/aots/tests/cmap0.tests b/test/shape/data/aots/tests/cmap0.tests similarity index 100% rename from test/shaping/data/aots/tests/cmap0.tests rename to test/shape/data/aots/tests/cmap0.tests diff --git a/test/shaping/data/aots/tests/cmap10.tests b/test/shape/data/aots/tests/cmap10.tests similarity index 100% rename from test/shaping/data/aots/tests/cmap10.tests rename to test/shape/data/aots/tests/cmap10.tests diff --git a/test/shaping/data/aots/tests/cmap12.tests b/test/shape/data/aots/tests/cmap12.tests similarity index 100% rename from test/shaping/data/aots/tests/cmap12.tests rename to test/shape/data/aots/tests/cmap12.tests diff --git a/test/shaping/data/aots/tests/cmap2.tests b/test/shape/data/aots/tests/cmap2.tests similarity index 100% rename from test/shaping/data/aots/tests/cmap2.tests rename to test/shape/data/aots/tests/cmap2.tests diff --git a/test/shaping/data/aots/tests/cmap4.tests b/test/shape/data/aots/tests/cmap4.tests similarity index 100% rename from test/shaping/data/aots/tests/cmap4.tests rename to test/shape/data/aots/tests/cmap4.tests diff --git a/test/shaping/data/aots/tests/cmap6.tests b/test/shape/data/aots/tests/cmap6.tests similarity index 100% rename from test/shaping/data/aots/tests/cmap6.tests rename to test/shape/data/aots/tests/cmap6.tests diff --git a/test/shaping/data/aots/tests/cmap8.tests b/test/shape/data/aots/tests/cmap8.tests similarity index 100% rename from test/shaping/data/aots/tests/cmap8.tests rename to test/shape/data/aots/tests/cmap8.tests diff --git a/test/shaping/data/aots/tests/gpos1_1_lookupflag.tests b/test/shape/data/aots/tests/gpos1_1_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos1_1_lookupflag.tests rename to test/shape/data/aots/tests/gpos1_1_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gpos1_1_simple.tests b/test/shape/data/aots/tests/gpos1_1_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos1_1_simple.tests rename to test/shape/data/aots/tests/gpos1_1_simple.tests diff --git a/test/shaping/data/aots/tests/gpos1_2.tests b/test/shape/data/aots/tests/gpos1_2.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos1_2.tests rename to test/shape/data/aots/tests/gpos1_2.tests diff --git a/test/shaping/data/aots/tests/gpos1_2_lookupflag.tests b/test/shape/data/aots/tests/gpos1_2_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos1_2_lookupflag.tests rename to test/shape/data/aots/tests/gpos1_2_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gpos2_1.tests b/test/shape/data/aots/tests/gpos2_1.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos2_1.tests rename to test/shape/data/aots/tests/gpos2_1.tests diff --git a/test/shaping/data/aots/tests/gpos2_1_lookupflag.tests b/test/shape/data/aots/tests/gpos2_1_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos2_1_lookupflag.tests rename to test/shape/data/aots/tests/gpos2_1_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gpos2_1_next_glyph.tests b/test/shape/data/aots/tests/gpos2_1_next_glyph.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos2_1_next_glyph.tests rename to test/shape/data/aots/tests/gpos2_1_next_glyph.tests diff --git a/test/shaping/data/aots/tests/gpos2_1_simple.tests b/test/shape/data/aots/tests/gpos2_1_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos2_1_simple.tests rename to test/shape/data/aots/tests/gpos2_1_simple.tests diff --git a/test/shaping/data/aots/tests/gpos2_2.tests b/test/shape/data/aots/tests/gpos2_2.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos2_2.tests rename to test/shape/data/aots/tests/gpos2_2.tests diff --git a/test/shaping/data/aots/tests/gpos3.tests b/test/shape/data/aots/tests/gpos3.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos3.tests rename to test/shape/data/aots/tests/gpos3.tests diff --git a/test/shaping/data/aots/tests/gpos3_lookupflag.tests b/test/shape/data/aots/tests/gpos3_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos3_lookupflag.tests rename to test/shape/data/aots/tests/gpos3_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gpos4_lookupflag.tests b/test/shape/data/aots/tests/gpos4_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos4_lookupflag.tests rename to test/shape/data/aots/tests/gpos4_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gpos4_multiple_anchors.tests b/test/shape/data/aots/tests/gpos4_multiple_anchors.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos4_multiple_anchors.tests rename to test/shape/data/aots/tests/gpos4_multiple_anchors.tests diff --git a/test/shaping/data/aots/tests/gpos4_simple.tests b/test/shape/data/aots/tests/gpos4_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos4_simple.tests rename to test/shape/data/aots/tests/gpos4_simple.tests diff --git a/test/shaping/data/aots/tests/gpos5.tests b/test/shape/data/aots/tests/gpos5.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos5.tests rename to test/shape/data/aots/tests/gpos5.tests diff --git a/test/shaping/data/aots/tests/gpos6.tests b/test/shape/data/aots/tests/gpos6.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos6.tests rename to test/shape/data/aots/tests/gpos6.tests diff --git a/test/shaping/data/aots/tests/gpos7_1.tests b/test/shape/data/aots/tests/gpos7_1.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos7_1.tests rename to test/shape/data/aots/tests/gpos7_1.tests diff --git a/test/shaping/data/aots/tests/gpos9.tests b/test/shape/data/aots/tests/gpos9.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos9.tests rename to test/shape/data/aots/tests/gpos9.tests diff --git a/test/shaping/data/aots/tests/gpos_chaining1_boundary.tests b/test/shape/data/aots/tests/gpos_chaining1_boundary.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_chaining1_boundary.tests rename to test/shape/data/aots/tests/gpos_chaining1_boundary.tests diff --git a/test/shaping/data/aots/tests/gpos_chaining1_lookupflag.tests b/test/shape/data/aots/tests/gpos_chaining1_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_chaining1_lookupflag.tests rename to test/shape/data/aots/tests/gpos_chaining1_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gpos_chaining1_multiple_subrules.tests b/test/shape/data/aots/tests/gpos_chaining1_multiple_subrules.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_chaining1_multiple_subrules.tests rename to test/shape/data/aots/tests/gpos_chaining1_multiple_subrules.tests diff --git a/test/shaping/data/aots/tests/gpos_chaining1_next_glyph.tests b/test/shape/data/aots/tests/gpos_chaining1_next_glyph.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_chaining1_next_glyph.tests rename to test/shape/data/aots/tests/gpos_chaining1_next_glyph.tests diff --git a/test/shaping/data/aots/tests/gpos_chaining1_simple.tests b/test/shape/data/aots/tests/gpos_chaining1_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_chaining1_simple.tests rename to test/shape/data/aots/tests/gpos_chaining1_simple.tests diff --git a/test/shaping/data/aots/tests/gpos_chaining1_successive.tests b/test/shape/data/aots/tests/gpos_chaining1_successive.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_chaining1_successive.tests rename to test/shape/data/aots/tests/gpos_chaining1_successive.tests diff --git a/test/shaping/data/aots/tests/gpos_chaining2_boundary.tests b/test/shape/data/aots/tests/gpos_chaining2_boundary.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_chaining2_boundary.tests rename to test/shape/data/aots/tests/gpos_chaining2_boundary.tests diff --git a/test/shaping/data/aots/tests/gpos_chaining2_lookupflag.tests b/test/shape/data/aots/tests/gpos_chaining2_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_chaining2_lookupflag.tests rename to test/shape/data/aots/tests/gpos_chaining2_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gpos_chaining2_multiple_subrules.tests b/test/shape/data/aots/tests/gpos_chaining2_multiple_subrules.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_chaining2_multiple_subrules.tests rename to test/shape/data/aots/tests/gpos_chaining2_multiple_subrules.tests diff --git a/test/shaping/data/aots/tests/gpos_chaining2_next_glyph.tests b/test/shape/data/aots/tests/gpos_chaining2_next_glyph.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_chaining2_next_glyph.tests rename to test/shape/data/aots/tests/gpos_chaining2_next_glyph.tests diff --git a/test/shaping/data/aots/tests/gpos_chaining2_simple.tests b/test/shape/data/aots/tests/gpos_chaining2_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_chaining2_simple.tests rename to test/shape/data/aots/tests/gpos_chaining2_simple.tests diff --git a/test/shaping/data/aots/tests/gpos_chaining2_successive.tests b/test/shape/data/aots/tests/gpos_chaining2_successive.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_chaining2_successive.tests rename to test/shape/data/aots/tests/gpos_chaining2_successive.tests diff --git a/test/shaping/data/aots/tests/gpos_chaining3_boundary.tests b/test/shape/data/aots/tests/gpos_chaining3_boundary.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_chaining3_boundary.tests rename to test/shape/data/aots/tests/gpos_chaining3_boundary.tests diff --git a/test/shaping/data/aots/tests/gpos_chaining3_lookupflag.tests b/test/shape/data/aots/tests/gpos_chaining3_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_chaining3_lookupflag.tests rename to test/shape/data/aots/tests/gpos_chaining3_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gpos_chaining3_next_glyph.tests b/test/shape/data/aots/tests/gpos_chaining3_next_glyph.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_chaining3_next_glyph.tests rename to test/shape/data/aots/tests/gpos_chaining3_next_glyph.tests diff --git a/test/shaping/data/aots/tests/gpos_chaining3_simple.tests b/test/shape/data/aots/tests/gpos_chaining3_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_chaining3_simple.tests rename to test/shape/data/aots/tests/gpos_chaining3_simple.tests diff --git a/test/shaping/data/aots/tests/gpos_chaining3_successive.tests b/test/shape/data/aots/tests/gpos_chaining3_successive.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_chaining3_successive.tests rename to test/shape/data/aots/tests/gpos_chaining3_successive.tests diff --git a/test/shaping/data/aots/tests/gpos_context1_boundary.tests b/test/shape/data/aots/tests/gpos_context1_boundary.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context1_boundary.tests rename to test/shape/data/aots/tests/gpos_context1_boundary.tests diff --git a/test/shaping/data/aots/tests/gpos_context1_expansion.tests b/test/shape/data/aots/tests/gpos_context1_expansion.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context1_expansion.tests rename to test/shape/data/aots/tests/gpos_context1_expansion.tests diff --git a/test/shaping/data/aots/tests/gpos_context1_lookupflag.tests b/test/shape/data/aots/tests/gpos_context1_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context1_lookupflag.tests rename to test/shape/data/aots/tests/gpos_context1_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gpos_context1_multiple_subrules.tests b/test/shape/data/aots/tests/gpos_context1_multiple_subrules.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context1_multiple_subrules.tests rename to test/shape/data/aots/tests/gpos_context1_multiple_subrules.tests diff --git a/test/shaping/data/aots/tests/gpos_context1_next_glyph.tests b/test/shape/data/aots/tests/gpos_context1_next_glyph.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context1_next_glyph.tests rename to test/shape/data/aots/tests/gpos_context1_next_glyph.tests diff --git a/test/shaping/data/aots/tests/gpos_context1_simple.tests b/test/shape/data/aots/tests/gpos_context1_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context1_simple.tests rename to test/shape/data/aots/tests/gpos_context1_simple.tests diff --git a/test/shaping/data/aots/tests/gpos_context1_successive.tests b/test/shape/data/aots/tests/gpos_context1_successive.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context1_successive.tests rename to test/shape/data/aots/tests/gpos_context1_successive.tests diff --git a/test/shaping/data/aots/tests/gpos_context2_boundary.tests b/test/shape/data/aots/tests/gpos_context2_boundary.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context2_boundary.tests rename to test/shape/data/aots/tests/gpos_context2_boundary.tests diff --git a/test/shaping/data/aots/tests/gpos_context2_classes.tests b/test/shape/data/aots/tests/gpos_context2_classes.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context2_classes.tests rename to test/shape/data/aots/tests/gpos_context2_classes.tests diff --git a/test/shaping/data/aots/tests/gpos_context2_expansion.tests b/test/shape/data/aots/tests/gpos_context2_expansion.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context2_expansion.tests rename to test/shape/data/aots/tests/gpos_context2_expansion.tests diff --git a/test/shaping/data/aots/tests/gpos_context2_lookupflag.tests b/test/shape/data/aots/tests/gpos_context2_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context2_lookupflag.tests rename to test/shape/data/aots/tests/gpos_context2_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gpos_context2_multiple_subrules.tests b/test/shape/data/aots/tests/gpos_context2_multiple_subrules.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context2_multiple_subrules.tests rename to test/shape/data/aots/tests/gpos_context2_multiple_subrules.tests diff --git a/test/shaping/data/aots/tests/gpos_context2_next_glyph.tests b/test/shape/data/aots/tests/gpos_context2_next_glyph.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context2_next_glyph.tests rename to test/shape/data/aots/tests/gpos_context2_next_glyph.tests diff --git a/test/shaping/data/aots/tests/gpos_context2_simple.tests b/test/shape/data/aots/tests/gpos_context2_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context2_simple.tests rename to test/shape/data/aots/tests/gpos_context2_simple.tests diff --git a/test/shaping/data/aots/tests/gpos_context2_successive.tests b/test/shape/data/aots/tests/gpos_context2_successive.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context2_successive.tests rename to test/shape/data/aots/tests/gpos_context2_successive.tests diff --git a/test/shaping/data/aots/tests/gpos_context3_boundary.tests b/test/shape/data/aots/tests/gpos_context3_boundary.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context3_boundary.tests rename to test/shape/data/aots/tests/gpos_context3_boundary.tests diff --git a/test/shaping/data/aots/tests/gpos_context3_lookupflag.tests b/test/shape/data/aots/tests/gpos_context3_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context3_lookupflag.tests rename to test/shape/data/aots/tests/gpos_context3_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gpos_context3_next_glyph.tests b/test/shape/data/aots/tests/gpos_context3_next_glyph.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context3_next_glyph.tests rename to test/shape/data/aots/tests/gpos_context3_next_glyph.tests diff --git a/test/shaping/data/aots/tests/gpos_context3_simple.tests b/test/shape/data/aots/tests/gpos_context3_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context3_simple.tests rename to test/shape/data/aots/tests/gpos_context3_simple.tests diff --git a/test/shaping/data/aots/tests/gpos_context3_successive.tests b/test/shape/data/aots/tests/gpos_context3_successive.tests similarity index 100% rename from test/shaping/data/aots/tests/gpos_context3_successive.tests rename to test/shape/data/aots/tests/gpos_context3_successive.tests diff --git a/test/shaping/data/aots/tests/gsub1_1_lookupflag.tests b/test/shape/data/aots/tests/gsub1_1_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub1_1_lookupflag.tests rename to test/shape/data/aots/tests/gsub1_1_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gsub1_1_modulo.tests b/test/shape/data/aots/tests/gsub1_1_modulo.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub1_1_modulo.tests rename to test/shape/data/aots/tests/gsub1_1_modulo.tests diff --git a/test/shaping/data/aots/tests/gsub1_1_simple.tests b/test/shape/data/aots/tests/gsub1_1_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub1_1_simple.tests rename to test/shape/data/aots/tests/gsub1_1_simple.tests diff --git a/test/shaping/data/aots/tests/gsub1_2_lookupflag.tests b/test/shape/data/aots/tests/gsub1_2_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub1_2_lookupflag.tests rename to test/shape/data/aots/tests/gsub1_2_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gsub1_2_simple.tests b/test/shape/data/aots/tests/gsub1_2_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub1_2_simple.tests rename to test/shape/data/aots/tests/gsub1_2_simple.tests diff --git a/test/shaping/data/aots/tests/gsub2_1_lookupflag.tests b/test/shape/data/aots/tests/gsub2_1_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub2_1_lookupflag.tests rename to test/shape/data/aots/tests/gsub2_1_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gsub2_1_multiple_sequences.tests b/test/shape/data/aots/tests/gsub2_1_multiple_sequences.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub2_1_multiple_sequences.tests rename to test/shape/data/aots/tests/gsub2_1_multiple_sequences.tests diff --git a/test/shaping/data/aots/tests/gsub2_1_simple.tests b/test/shape/data/aots/tests/gsub2_1_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub2_1_simple.tests rename to test/shape/data/aots/tests/gsub2_1_simple.tests diff --git a/test/shaping/data/aots/tests/gsub3_1_lookupflag.tests b/test/shape/data/aots/tests/gsub3_1_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub3_1_lookupflag.tests rename to test/shape/data/aots/tests/gsub3_1_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gsub3_1_multiple.tests b/test/shape/data/aots/tests/gsub3_1_multiple.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub3_1_multiple.tests rename to test/shape/data/aots/tests/gsub3_1_multiple.tests diff --git a/test/shaping/data/aots/tests/gsub3_1_simple.tests b/test/shape/data/aots/tests/gsub3_1_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub3_1_simple.tests rename to test/shape/data/aots/tests/gsub3_1_simple.tests diff --git a/test/shaping/data/aots/tests/gsub4_1_lookupflag.tests b/test/shape/data/aots/tests/gsub4_1_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub4_1_lookupflag.tests rename to test/shape/data/aots/tests/gsub4_1_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gsub4_1_multiple_ligatures.tests b/test/shape/data/aots/tests/gsub4_1_multiple_ligatures.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub4_1_multiple_ligatures.tests rename to test/shape/data/aots/tests/gsub4_1_multiple_ligatures.tests diff --git a/test/shaping/data/aots/tests/gsub4_1_multiple_ligsets.tests b/test/shape/data/aots/tests/gsub4_1_multiple_ligsets.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub4_1_multiple_ligsets.tests rename to test/shape/data/aots/tests/gsub4_1_multiple_ligsets.tests diff --git a/test/shaping/data/aots/tests/gsub4_1_simple.tests b/test/shape/data/aots/tests/gsub4_1_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub4_1_simple.tests rename to test/shape/data/aots/tests/gsub4_1_simple.tests diff --git a/test/shaping/data/aots/tests/gsub7.tests b/test/shape/data/aots/tests/gsub7.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub7.tests rename to test/shape/data/aots/tests/gsub7.tests diff --git a/test/shaping/data/aots/tests/gsub_chaining1_boundary.tests b/test/shape/data/aots/tests/gsub_chaining1_boundary.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_chaining1_boundary.tests rename to test/shape/data/aots/tests/gsub_chaining1_boundary.tests diff --git a/test/shaping/data/aots/tests/gsub_chaining1_lookupflag.tests b/test/shape/data/aots/tests/gsub_chaining1_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_chaining1_lookupflag.tests rename to test/shape/data/aots/tests/gsub_chaining1_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gsub_chaining1_multiple_subrules.tests b/test/shape/data/aots/tests/gsub_chaining1_multiple_subrules.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_chaining1_multiple_subrules.tests rename to test/shape/data/aots/tests/gsub_chaining1_multiple_subrules.tests diff --git a/test/shaping/data/aots/tests/gsub_chaining1_next_glyph.tests b/test/shape/data/aots/tests/gsub_chaining1_next_glyph.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_chaining1_next_glyph.tests rename to test/shape/data/aots/tests/gsub_chaining1_next_glyph.tests diff --git a/test/shaping/data/aots/tests/gsub_chaining1_simple.tests b/test/shape/data/aots/tests/gsub_chaining1_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_chaining1_simple.tests rename to test/shape/data/aots/tests/gsub_chaining1_simple.tests diff --git a/test/shaping/data/aots/tests/gsub_chaining1_successive.tests b/test/shape/data/aots/tests/gsub_chaining1_successive.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_chaining1_successive.tests rename to test/shape/data/aots/tests/gsub_chaining1_successive.tests diff --git a/test/shaping/data/aots/tests/gsub_chaining2_boundary.tests b/test/shape/data/aots/tests/gsub_chaining2_boundary.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_chaining2_boundary.tests rename to test/shape/data/aots/tests/gsub_chaining2_boundary.tests diff --git a/test/shaping/data/aots/tests/gsub_chaining2_lookupflag.tests b/test/shape/data/aots/tests/gsub_chaining2_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_chaining2_lookupflag.tests rename to test/shape/data/aots/tests/gsub_chaining2_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gsub_chaining2_multiple_subrules.tests b/test/shape/data/aots/tests/gsub_chaining2_multiple_subrules.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_chaining2_multiple_subrules.tests rename to test/shape/data/aots/tests/gsub_chaining2_multiple_subrules.tests diff --git a/test/shaping/data/aots/tests/gsub_chaining2_next_glyph.tests b/test/shape/data/aots/tests/gsub_chaining2_next_glyph.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_chaining2_next_glyph.tests rename to test/shape/data/aots/tests/gsub_chaining2_next_glyph.tests diff --git a/test/shaping/data/aots/tests/gsub_chaining2_simple.tests b/test/shape/data/aots/tests/gsub_chaining2_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_chaining2_simple.tests rename to test/shape/data/aots/tests/gsub_chaining2_simple.tests diff --git a/test/shaping/data/aots/tests/gsub_chaining2_successive.tests b/test/shape/data/aots/tests/gsub_chaining2_successive.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_chaining2_successive.tests rename to test/shape/data/aots/tests/gsub_chaining2_successive.tests diff --git a/test/shaping/data/aots/tests/gsub_chaining3_boundary.tests b/test/shape/data/aots/tests/gsub_chaining3_boundary.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_chaining3_boundary.tests rename to test/shape/data/aots/tests/gsub_chaining3_boundary.tests diff --git a/test/shaping/data/aots/tests/gsub_chaining3_lookupflag.tests b/test/shape/data/aots/tests/gsub_chaining3_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_chaining3_lookupflag.tests rename to test/shape/data/aots/tests/gsub_chaining3_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gsub_chaining3_next_glyph.tests b/test/shape/data/aots/tests/gsub_chaining3_next_glyph.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_chaining3_next_glyph.tests rename to test/shape/data/aots/tests/gsub_chaining3_next_glyph.tests diff --git a/test/shaping/data/aots/tests/gsub_chaining3_simple.tests b/test/shape/data/aots/tests/gsub_chaining3_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_chaining3_simple.tests rename to test/shape/data/aots/tests/gsub_chaining3_simple.tests diff --git a/test/shaping/data/aots/tests/gsub_chaining3_successive.tests b/test/shape/data/aots/tests/gsub_chaining3_successive.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_chaining3_successive.tests rename to test/shape/data/aots/tests/gsub_chaining3_successive.tests diff --git a/test/shaping/data/aots/tests/gsub_context1_boundary.tests b/test/shape/data/aots/tests/gsub_context1_boundary.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context1_boundary.tests rename to test/shape/data/aots/tests/gsub_context1_boundary.tests diff --git a/test/shaping/data/aots/tests/gsub_context1_expansion.tests b/test/shape/data/aots/tests/gsub_context1_expansion.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context1_expansion.tests rename to test/shape/data/aots/tests/gsub_context1_expansion.tests diff --git a/test/shaping/data/aots/tests/gsub_context1_lookupflag.tests b/test/shape/data/aots/tests/gsub_context1_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context1_lookupflag.tests rename to test/shape/data/aots/tests/gsub_context1_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gsub_context1_multiple_subrules.tests b/test/shape/data/aots/tests/gsub_context1_multiple_subrules.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context1_multiple_subrules.tests rename to test/shape/data/aots/tests/gsub_context1_multiple_subrules.tests diff --git a/test/shaping/data/aots/tests/gsub_context1_next_glyph.tests b/test/shape/data/aots/tests/gsub_context1_next_glyph.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context1_next_glyph.tests rename to test/shape/data/aots/tests/gsub_context1_next_glyph.tests diff --git a/test/shaping/data/aots/tests/gsub_context1_simple.tests b/test/shape/data/aots/tests/gsub_context1_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context1_simple.tests rename to test/shape/data/aots/tests/gsub_context1_simple.tests diff --git a/test/shaping/data/aots/tests/gsub_context1_successive.tests b/test/shape/data/aots/tests/gsub_context1_successive.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context1_successive.tests rename to test/shape/data/aots/tests/gsub_context1_successive.tests diff --git a/test/shaping/data/aots/tests/gsub_context2_boundary.tests b/test/shape/data/aots/tests/gsub_context2_boundary.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context2_boundary.tests rename to test/shape/data/aots/tests/gsub_context2_boundary.tests diff --git a/test/shaping/data/aots/tests/gsub_context2_classes.tests b/test/shape/data/aots/tests/gsub_context2_classes.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context2_classes.tests rename to test/shape/data/aots/tests/gsub_context2_classes.tests diff --git a/test/shaping/data/aots/tests/gsub_context2_expansion.tests b/test/shape/data/aots/tests/gsub_context2_expansion.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context2_expansion.tests rename to test/shape/data/aots/tests/gsub_context2_expansion.tests diff --git a/test/shaping/data/aots/tests/gsub_context2_lookupflag.tests b/test/shape/data/aots/tests/gsub_context2_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context2_lookupflag.tests rename to test/shape/data/aots/tests/gsub_context2_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gsub_context2_multiple_subrules.tests b/test/shape/data/aots/tests/gsub_context2_multiple_subrules.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context2_multiple_subrules.tests rename to test/shape/data/aots/tests/gsub_context2_multiple_subrules.tests diff --git a/test/shaping/data/aots/tests/gsub_context2_next_glyph.tests b/test/shape/data/aots/tests/gsub_context2_next_glyph.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context2_next_glyph.tests rename to test/shape/data/aots/tests/gsub_context2_next_glyph.tests diff --git a/test/shaping/data/aots/tests/gsub_context2_simple.tests b/test/shape/data/aots/tests/gsub_context2_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context2_simple.tests rename to test/shape/data/aots/tests/gsub_context2_simple.tests diff --git a/test/shaping/data/aots/tests/gsub_context2_successive.tests b/test/shape/data/aots/tests/gsub_context2_successive.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context2_successive.tests rename to test/shape/data/aots/tests/gsub_context2_successive.tests diff --git a/test/shaping/data/aots/tests/gsub_context3_boundary.tests b/test/shape/data/aots/tests/gsub_context3_boundary.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context3_boundary.tests rename to test/shape/data/aots/tests/gsub_context3_boundary.tests diff --git a/test/shaping/data/aots/tests/gsub_context3_lookupflag.tests b/test/shape/data/aots/tests/gsub_context3_lookupflag.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context3_lookupflag.tests rename to test/shape/data/aots/tests/gsub_context3_lookupflag.tests diff --git a/test/shaping/data/aots/tests/gsub_context3_next_glyph.tests b/test/shape/data/aots/tests/gsub_context3_next_glyph.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context3_next_glyph.tests rename to test/shape/data/aots/tests/gsub_context3_next_glyph.tests diff --git a/test/shaping/data/aots/tests/gsub_context3_simple.tests b/test/shape/data/aots/tests/gsub_context3_simple.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context3_simple.tests rename to test/shape/data/aots/tests/gsub_context3_simple.tests diff --git a/test/shaping/data/aots/tests/gsub_context3_successive.tests b/test/shape/data/aots/tests/gsub_context3_successive.tests similarity index 100% rename from test/shaping/data/aots/tests/gsub_context3_successive.tests rename to test/shape/data/aots/tests/gsub_context3_successive.tests diff --git a/test/shaping/data/aots/tests/lookupflag_ignore_attach.tests b/test/shape/data/aots/tests/lookupflag_ignore_attach.tests similarity index 100% rename from test/shaping/data/aots/tests/lookupflag_ignore_attach.tests rename to test/shape/data/aots/tests/lookupflag_ignore_attach.tests diff --git a/test/shaping/data/aots/tests/lookupflag_ignore_base.tests b/test/shape/data/aots/tests/lookupflag_ignore_base.tests similarity index 100% rename from test/shaping/data/aots/tests/lookupflag_ignore_base.tests rename to test/shape/data/aots/tests/lookupflag_ignore_base.tests diff --git a/test/shaping/data/aots/tests/lookupflag_ignore_combination.tests b/test/shape/data/aots/tests/lookupflag_ignore_combination.tests similarity index 100% rename from test/shaping/data/aots/tests/lookupflag_ignore_combination.tests rename to test/shape/data/aots/tests/lookupflag_ignore_combination.tests diff --git a/test/shaping/data/aots/tests/lookupflag_ignore_ligatures.tests b/test/shape/data/aots/tests/lookupflag_ignore_ligatures.tests similarity index 100% rename from test/shaping/data/aots/tests/lookupflag_ignore_ligatures.tests rename to test/shape/data/aots/tests/lookupflag_ignore_ligatures.tests diff --git a/test/shaping/data/aots/tests/lookupflag_ignore_marks.tests b/test/shape/data/aots/tests/lookupflag_ignore_marks.tests similarity index 100% rename from test/shaping/data/aots/tests/lookupflag_ignore_marks.tests rename to test/shape/data/aots/tests/lookupflag_ignore_marks.tests diff --git a/test/shaping/data/aots/update.py b/test/shape/data/aots/update.py similarity index 100% rename from test/shaping/data/aots/update.py rename to test/shape/data/aots/update.py diff --git a/test/shaping/data/in-house/COPYING b/test/shape/data/in-house/COPYING similarity index 100% rename from test/shaping/data/in-house/COPYING rename to test/shape/data/in-house/COPYING diff --git a/test/shaping/data/in-house/Makefile.am b/test/shape/data/in-house/Makefile.am similarity index 100% rename from test/shaping/data/in-house/Makefile.am rename to test/shape/data/in-house/Makefile.am diff --git a/test/shaping/data/in-house/Makefile.sources b/test/shape/data/in-house/Makefile.sources similarity index 100% rename from test/shaping/data/in-house/Makefile.sources rename to test/shape/data/in-house/Makefile.sources diff --git a/test/shaping/data/in-house/fonts/03e3f463c3a985bc42096620cc415342818454fb.ttf b/test/shape/data/in-house/fonts/03e3f463c3a985bc42096620cc415342818454fb.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/03e3f463c3a985bc42096620cc415342818454fb.ttf rename to test/shape/data/in-house/fonts/03e3f463c3a985bc42096620cc415342818454fb.ttf diff --git a/test/shaping/data/in-house/fonts/051d92f8bc6ff724511b296c27623f824de256e9.ttf b/test/shape/data/in-house/fonts/051d92f8bc6ff724511b296c27623f824de256e9.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/051d92f8bc6ff724511b296c27623f824de256e9.ttf rename to test/shape/data/in-house/fonts/051d92f8bc6ff724511b296c27623f824de256e9.ttf diff --git a/test/shaping/data/in-house/fonts/065b01e54f35f0d849fd43bd5b936212739a50cb.ttf b/test/shape/data/in-house/fonts/065b01e54f35f0d849fd43bd5b936212739a50cb.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/065b01e54f35f0d849fd43bd5b936212739a50cb.ttf rename to test/shape/data/in-house/fonts/065b01e54f35f0d849fd43bd5b936212739a50cb.ttf diff --git a/test/shaping/data/in-house/fonts/074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf b/test/shape/data/in-house/fonts/074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf rename to test/shape/data/in-house/fonts/074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf diff --git a/test/shaping/data/in-house/fonts/07f054357ff8638bac3711b422a1e31180bba863.ttf b/test/shape/data/in-house/fonts/07f054357ff8638bac3711b422a1e31180bba863.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/07f054357ff8638bac3711b422a1e31180bba863.ttf rename to test/shape/data/in-house/fonts/07f054357ff8638bac3711b422a1e31180bba863.ttf diff --git a/test/shaping/data/in-house/fonts/08b4b136f418add748dc641eb4a83033476f1170.ttf b/test/shape/data/in-house/fonts/08b4b136f418add748dc641eb4a83033476f1170.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/08b4b136f418add748dc641eb4a83033476f1170.ttf rename to test/shape/data/in-house/fonts/08b4b136f418add748dc641eb4a83033476f1170.ttf diff --git a/test/shaping/data/in-house/fonts/15dfc433a135a658b9f4b1a861b5cdd9658ccbb9.ttf b/test/shape/data/in-house/fonts/15dfc433a135a658b9f4b1a861b5cdd9658ccbb9.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/15dfc433a135a658b9f4b1a861b5cdd9658ccbb9.ttf rename to test/shape/data/in-house/fonts/15dfc433a135a658b9f4b1a861b5cdd9658ccbb9.ttf diff --git a/test/shaping/data/in-house/fonts/1735326da89f0818cd8c51a0600e9789812c0f94.ttf b/test/shape/data/in-house/fonts/1735326da89f0818cd8c51a0600e9789812c0f94.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/1735326da89f0818cd8c51a0600e9789812c0f94.ttf rename to test/shape/data/in-house/fonts/1735326da89f0818cd8c51a0600e9789812c0f94.ttf diff --git a/test/shaping/data/in-house/fonts/191826b9643e3f124d865d617ae609db6a2ce203.ttf b/test/shape/data/in-house/fonts/191826b9643e3f124d865d617ae609db6a2ce203.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/191826b9643e3f124d865d617ae609db6a2ce203.ttf rename to test/shape/data/in-house/fonts/191826b9643e3f124d865d617ae609db6a2ce203.ttf diff --git a/test/shaping/data/in-house/fonts/1a3d8f381387dd29be1e897e4b5100ac8b4829e1.ttf b/test/shape/data/in-house/fonts/1a3d8f381387dd29be1e897e4b5100ac8b4829e1.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/1a3d8f381387dd29be1e897e4b5100ac8b4829e1.ttf rename to test/shape/data/in-house/fonts/1a3d8f381387dd29be1e897e4b5100ac8b4829e1.ttf diff --git a/test/shaping/data/in-house/fonts/1a5face3fcbd929d228235c2f72bbd6f8eb37424.ttf b/test/shape/data/in-house/fonts/1a5face3fcbd929d228235c2f72bbd6f8eb37424.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/1a5face3fcbd929d228235c2f72bbd6f8eb37424.ttf rename to test/shape/data/in-house/fonts/1a5face3fcbd929d228235c2f72bbd6f8eb37424.ttf diff --git a/test/shaping/data/in-house/fonts/1c04a16f32a39c26c851b7fc014d2e8d298ba2b8.ttf b/test/shape/data/in-house/fonts/1c04a16f32a39c26c851b7fc014d2e8d298ba2b8.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/1c04a16f32a39c26c851b7fc014d2e8d298ba2b8.ttf rename to test/shape/data/in-house/fonts/1c04a16f32a39c26c851b7fc014d2e8d298ba2b8.ttf diff --git a/test/shaping/data/in-house/fonts/1c2c3fc37b2d4c3cb2ef726c6cdaaabd4b7f3eb9.ttf b/test/shape/data/in-house/fonts/1c2c3fc37b2d4c3cb2ef726c6cdaaabd4b7f3eb9.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/1c2c3fc37b2d4c3cb2ef726c6cdaaabd4b7f3eb9.ttf rename to test/shape/data/in-house/fonts/1c2c3fc37b2d4c3cb2ef726c6cdaaabd4b7f3eb9.ttf diff --git a/test/shaping/data/in-house/fonts/1c2fb74c1b2aa173262734c1f616148f1648cfd6.ttf b/test/shape/data/in-house/fonts/1c2fb74c1b2aa173262734c1f616148f1648cfd6.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/1c2fb74c1b2aa173262734c1f616148f1648cfd6.ttf rename to test/shape/data/in-house/fonts/1c2fb74c1b2aa173262734c1f616148f1648cfd6.ttf diff --git a/test/shaping/data/in-house/fonts/1ed7e9064f008f62de6ff0207bb4dd29409597a5.ttf b/test/shape/data/in-house/fonts/1ed7e9064f008f62de6ff0207bb4dd29409597a5.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/1ed7e9064f008f62de6ff0207bb4dd29409597a5.ttf rename to test/shape/data/in-house/fonts/1ed7e9064f008f62de6ff0207bb4dd29409597a5.ttf diff --git a/test/shaping/data/in-house/fonts/21b7fb9c1eeae260473809fbc1fe330f66a507cd.ttf b/test/shape/data/in-house/fonts/21b7fb9c1eeae260473809fbc1fe330f66a507cd.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/21b7fb9c1eeae260473809fbc1fe330f66a507cd.ttf rename to test/shape/data/in-house/fonts/21b7fb9c1eeae260473809fbc1fe330f66a507cd.ttf diff --git a/test/shaping/data/in-house/fonts/226bc2deab3846f1a682085f70c67d0421014144.ttf b/test/shape/data/in-house/fonts/226bc2deab3846f1a682085f70c67d0421014144.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/226bc2deab3846f1a682085f70c67d0421014144.ttf rename to test/shape/data/in-house/fonts/226bc2deab3846f1a682085f70c67d0421014144.ttf diff --git a/test/shaping/data/in-house/fonts/24b8d24d00ae86f49791b746da4c9d3f717a51a8.ttf b/test/shape/data/in-house/fonts/24b8d24d00ae86f49791b746da4c9d3f717a51a8.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/24b8d24d00ae86f49791b746da4c9d3f717a51a8.ttf rename to test/shape/data/in-house/fonts/24b8d24d00ae86f49791b746da4c9d3f717a51a8.ttf diff --git a/test/shaping/data/in-house/fonts/2681c1c72d6484ed3410417f521b1b819b4e2392.ttf b/test/shape/data/in-house/fonts/2681c1c72d6484ed3410417f521b1b819b4e2392.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/2681c1c72d6484ed3410417f521b1b819b4e2392.ttf rename to test/shape/data/in-house/fonts/2681c1c72d6484ed3410417f521b1b819b4e2392.ttf diff --git a/test/shaping/data/in-house/fonts/270b89df543a7e48e206a2d830c0e10e5265c630.ttf b/test/shape/data/in-house/fonts/270b89df543a7e48e206a2d830c0e10e5265c630.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/270b89df543a7e48e206a2d830c0e10e5265c630.ttf rename to test/shape/data/in-house/fonts/270b89df543a7e48e206a2d830c0e10e5265c630.ttf diff --git a/test/shaping/data/in-house/fonts/28f497629c04ceb15546c9a70e0730125ed6698d.ttf b/test/shape/data/in-house/fonts/28f497629c04ceb15546c9a70e0730125ed6698d.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/28f497629c04ceb15546c9a70e0730125ed6698d.ttf rename to test/shape/data/in-house/fonts/28f497629c04ceb15546c9a70e0730125ed6698d.ttf diff --git a/test/shaping/data/in-house/fonts/298c9e1d955f10f6f72c6915c3c6ff9bf9695cec.ttf b/test/shape/data/in-house/fonts/298c9e1d955f10f6f72c6915c3c6ff9bf9695cec.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/298c9e1d955f10f6f72c6915c3c6ff9bf9695cec.ttf rename to test/shape/data/in-house/fonts/298c9e1d955f10f6f72c6915c3c6ff9bf9695cec.ttf diff --git a/test/shaping/data/in-house/fonts/2a670df15b73a5dc75a5cc491bde5ac93c5077dc.ttf b/test/shape/data/in-house/fonts/2a670df15b73a5dc75a5cc491bde5ac93c5077dc.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/2a670df15b73a5dc75a5cc491bde5ac93c5077dc.ttf rename to test/shape/data/in-house/fonts/2a670df15b73a5dc75a5cc491bde5ac93c5077dc.ttf diff --git a/test/shaping/data/in-house/fonts/2c25beb56d9c556622d56b0b5d02b4670c034f89.ttf b/test/shape/data/in-house/fonts/2c25beb56d9c556622d56b0b5d02b4670c034f89.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/2c25beb56d9c556622d56b0b5d02b4670c034f89.ttf rename to test/shape/data/in-house/fonts/2c25beb56d9c556622d56b0b5d02b4670c034f89.ttf diff --git a/test/shaping/data/in-house/fonts/2de1ab4907ab688c0cfc236b0bf51151db38bf2e.ttf b/test/shape/data/in-house/fonts/2de1ab4907ab688c0cfc236b0bf51151db38bf2e.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/2de1ab4907ab688c0cfc236b0bf51151db38bf2e.ttf rename to test/shape/data/in-house/fonts/2de1ab4907ab688c0cfc236b0bf51151db38bf2e.ttf diff --git a/test/shaping/data/in-house/fonts/341421e629668b1a1242245d39238ca48432d35d.ttf b/test/shape/data/in-house/fonts/341421e629668b1a1242245d39238ca48432d35d.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/341421e629668b1a1242245d39238ca48432d35d.ttf rename to test/shape/data/in-house/fonts/341421e629668b1a1242245d39238ca48432d35d.ttf diff --git a/test/shaping/data/in-house/fonts/3493e92eaded2661cadde752a39f9d58b11f0326.ttf b/test/shape/data/in-house/fonts/3493e92eaded2661cadde752a39f9d58b11f0326.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/3493e92eaded2661cadde752a39f9d58b11f0326.ttf rename to test/shape/data/in-house/fonts/3493e92eaded2661cadde752a39f9d58b11f0326.ttf diff --git a/test/shaping/data/in-house/fonts/37033cc5cf37bb223d7355153016b6ccece93b28.ttf b/test/shape/data/in-house/fonts/37033cc5cf37bb223d7355153016b6ccece93b28.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/37033cc5cf37bb223d7355153016b6ccece93b28.ttf rename to test/shape/data/in-house/fonts/37033cc5cf37bb223d7355153016b6ccece93b28.ttf diff --git a/test/shaping/data/in-house/fonts/373e67bf41ca264e260a9716162b71a23549e885.ttf b/test/shape/data/in-house/fonts/373e67bf41ca264e260a9716162b71a23549e885.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/373e67bf41ca264e260a9716162b71a23549e885.ttf rename to test/shape/data/in-house/fonts/373e67bf41ca264e260a9716162b71a23549e885.ttf diff --git a/test/shaping/data/in-house/fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf b/test/shape/data/in-house/fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf rename to test/shape/data/in-house/fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf diff --git a/test/shaping/data/in-house/fonts/3b791518a9ba89675df02f1eefbc9026a50648a6.ttf b/test/shape/data/in-house/fonts/3b791518a9ba89675df02f1eefbc9026a50648a6.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/3b791518a9ba89675df02f1eefbc9026a50648a6.ttf rename to test/shape/data/in-house/fonts/3b791518a9ba89675df02f1eefbc9026a50648a6.ttf diff --git a/test/shaping/data/in-house/fonts/3c96e7a303c58475a8c750bf4289bbe73784f37d.ttf b/test/shape/data/in-house/fonts/3c96e7a303c58475a8c750bf4289bbe73784f37d.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/3c96e7a303c58475a8c750bf4289bbe73784f37d.ttf rename to test/shape/data/in-house/fonts/3c96e7a303c58475a8c750bf4289bbe73784f37d.ttf diff --git a/test/shaping/data/in-house/fonts/3cae6bfe5b57c07ba81ddbd54c02fe4f3a1e3bf6.ttf b/test/shape/data/in-house/fonts/3cae6bfe5b57c07ba81ddbd54c02fe4f3a1e3bf6.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/3cae6bfe5b57c07ba81ddbd54c02fe4f3a1e3bf6.ttf rename to test/shape/data/in-house/fonts/3cae6bfe5b57c07ba81ddbd54c02fe4f3a1e3bf6.ttf diff --git a/test/shaping/data/in-house/fonts/3cc01fede4debd4b7794ccb1b16cdb9987ea7571.ttf b/test/shape/data/in-house/fonts/3cc01fede4debd4b7794ccb1b16cdb9987ea7571.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/3cc01fede4debd4b7794ccb1b16cdb9987ea7571.ttf rename to test/shape/data/in-house/fonts/3cc01fede4debd4b7794ccb1b16cdb9987ea7571.ttf diff --git a/test/shaping/data/in-house/fonts/3cf6f8ac6d647473a43a3100e7494b202b2cfafe.ttf b/test/shape/data/in-house/fonts/3cf6f8ac6d647473a43a3100e7494b202b2cfafe.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/3cf6f8ac6d647473a43a3100e7494b202b2cfafe.ttf rename to test/shape/data/in-house/fonts/3cf6f8ac6d647473a43a3100e7494b202b2cfafe.ttf diff --git a/test/shaping/data/in-house/fonts/3d0b77a2360aa6faa1385aaa510509ab70dfbeff.ttf b/test/shape/data/in-house/fonts/3d0b77a2360aa6faa1385aaa510509ab70dfbeff.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/3d0b77a2360aa6faa1385aaa510509ab70dfbeff.ttf rename to test/shape/data/in-house/fonts/3d0b77a2360aa6faa1385aaa510509ab70dfbeff.ttf diff --git a/test/shaping/data/in-house/fonts/43ef465752be9af900745f72fe29cb853a1401a5.ttf b/test/shape/data/in-house/fonts/43ef465752be9af900745f72fe29cb853a1401a5.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/43ef465752be9af900745f72fe29cb853a1401a5.ttf rename to test/shape/data/in-house/fonts/43ef465752be9af900745f72fe29cb853a1401a5.ttf diff --git a/test/shaping/data/in-house/fonts/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf b/test/shape/data/in-house/fonts/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf rename to test/shape/data/in-house/fonts/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf diff --git a/test/shaping/data/in-house/fonts/46669c8860cbfea13562a6ca0d83130ee571137b.ttf b/test/shape/data/in-house/fonts/46669c8860cbfea13562a6ca0d83130ee571137b.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/46669c8860cbfea13562a6ca0d83130ee571137b.ttf rename to test/shape/data/in-house/fonts/46669c8860cbfea13562a6ca0d83130ee571137b.ttf diff --git a/test/shaping/data/in-house/fonts/49c9f7485c1392fa09a1b801bc2ffea79275f22e.ttf b/test/shape/data/in-house/fonts/49c9f7485c1392fa09a1b801bc2ffea79275f22e.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/49c9f7485c1392fa09a1b801bc2ffea79275f22e.ttf rename to test/shape/data/in-house/fonts/49c9f7485c1392fa09a1b801bc2ffea79275f22e.ttf diff --git a/test/shaping/data/in-house/fonts/4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf b/test/shape/data/in-house/fonts/4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf rename to test/shape/data/in-house/fonts/4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf diff --git a/test/shaping/data/in-house/fonts/4cbbc461be066fccc611dcc634af6e8cb2705537.ttf b/test/shape/data/in-house/fonts/4cbbc461be066fccc611dcc634af6e8cb2705537.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/4cbbc461be066fccc611dcc634af6e8cb2705537.ttf rename to test/shape/data/in-house/fonts/4cbbc461be066fccc611dcc634af6e8cb2705537.ttf diff --git a/test/shaping/data/in-house/fonts/4cce528e99f600ed9c25a2b69e32eb94a03b4ae8.ttf b/test/shape/data/in-house/fonts/4cce528e99f600ed9c25a2b69e32eb94a03b4ae8.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/4cce528e99f600ed9c25a2b69e32eb94a03b4ae8.ttf rename to test/shape/data/in-house/fonts/4cce528e99f600ed9c25a2b69e32eb94a03b4ae8.ttf diff --git a/test/shaping/data/in-house/fonts/4d4206e30b2dbf1c1ef492a8eae1c9e7829ebad8.ttf b/test/shape/data/in-house/fonts/4d4206e30b2dbf1c1ef492a8eae1c9e7829ebad8.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/4d4206e30b2dbf1c1ef492a8eae1c9e7829ebad8.ttf rename to test/shape/data/in-house/fonts/4d4206e30b2dbf1c1ef492a8eae1c9e7829ebad8.ttf diff --git a/test/shaping/data/in-house/fonts/4fac3929fc3332834e93673780ec0fe94342d193.ttf b/test/shape/data/in-house/fonts/4fac3929fc3332834e93673780ec0fe94342d193.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/4fac3929fc3332834e93673780ec0fe94342d193.ttf rename to test/shape/data/in-house/fonts/4fac3929fc3332834e93673780ec0fe94342d193.ttf diff --git a/test/shaping/data/in-house/fonts/5028afb650b1bb718ed2131e872fbcce57828fff.ttf b/test/shape/data/in-house/fonts/5028afb650b1bb718ed2131e872fbcce57828fff.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/5028afb650b1bb718ed2131e872fbcce57828fff.ttf rename to test/shape/data/in-house/fonts/5028afb650b1bb718ed2131e872fbcce57828fff.ttf diff --git a/test/shaping/data/in-house/fonts/53374c7ca3657be37efde7ed02ae34229a56ae1f.ttf b/test/shape/data/in-house/fonts/53374c7ca3657be37efde7ed02ae34229a56ae1f.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/53374c7ca3657be37efde7ed02ae34229a56ae1f.ttf rename to test/shape/data/in-house/fonts/53374c7ca3657be37efde7ed02ae34229a56ae1f.ttf diff --git a/test/shaping/data/in-house/fonts/53a91c20e33a596f2be17fb68b382d6b7eb85d5c.ttf b/test/shape/data/in-house/fonts/53a91c20e33a596f2be17fb68b382d6b7eb85d5c.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/53a91c20e33a596f2be17fb68b382d6b7eb85d5c.ttf rename to test/shape/data/in-house/fonts/53a91c20e33a596f2be17fb68b382d6b7eb85d5c.ttf diff --git a/test/shaping/data/in-house/fonts/54674a3111d209fb6be0ed31745314b7a8d2c244.ttf b/test/shape/data/in-house/fonts/54674a3111d209fb6be0ed31745314b7a8d2c244.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/54674a3111d209fb6be0ed31745314b7a8d2c244.ttf rename to test/shape/data/in-house/fonts/54674a3111d209fb6be0ed31745314b7a8d2c244.ttf diff --git a/test/shaping/data/in-house/fonts/55c88ebbe938680b08f92c3de20713183e0c7481.ttf b/test/shape/data/in-house/fonts/55c88ebbe938680b08f92c3de20713183e0c7481.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/55c88ebbe938680b08f92c3de20713183e0c7481.ttf rename to test/shape/data/in-house/fonts/55c88ebbe938680b08f92c3de20713183e0c7481.ttf diff --git a/test/shaping/data/in-house/fonts/56cfd0e18d07f41c38e9598545a6d369127fc6f9.ttf b/test/shape/data/in-house/fonts/56cfd0e18d07f41c38e9598545a6d369127fc6f9.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/56cfd0e18d07f41c38e9598545a6d369127fc6f9.ttf rename to test/shape/data/in-house/fonts/56cfd0e18d07f41c38e9598545a6d369127fc6f9.ttf diff --git a/test/shaping/data/in-house/fonts/573d3a3177c9a8646e94c8a0d7b224334340946a.ttf b/test/shape/data/in-house/fonts/573d3a3177c9a8646e94c8a0d7b224334340946a.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/573d3a3177c9a8646e94c8a0d7b224334340946a.ttf rename to test/shape/data/in-house/fonts/573d3a3177c9a8646e94c8a0d7b224334340946a.ttf diff --git a/test/shaping/data/in-house/fonts/57a9d9f83020155cbb1d2be1f43d82388cbecc88.ttf b/test/shape/data/in-house/fonts/57a9d9f83020155cbb1d2be1f43d82388cbecc88.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/57a9d9f83020155cbb1d2be1f43d82388cbecc88.ttf rename to test/shape/data/in-house/fonts/57a9d9f83020155cbb1d2be1f43d82388cbecc88.ttf diff --git a/test/shaping/data/in-house/fonts/59a585a63b3df608fbeef00956c8c108deec7de6.ttf b/test/shape/data/in-house/fonts/59a585a63b3df608fbeef00956c8c108deec7de6.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/59a585a63b3df608fbeef00956c8c108deec7de6.ttf rename to test/shape/data/in-house/fonts/59a585a63b3df608fbeef00956c8c108deec7de6.ttf diff --git a/test/shaping/data/in-house/fonts/5af5361ed4d1e8305780b100e1730cb09132f8d1.ttf b/test/shape/data/in-house/fonts/5af5361ed4d1e8305780b100e1730cb09132f8d1.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/5af5361ed4d1e8305780b100e1730cb09132f8d1.ttf rename to test/shape/data/in-house/fonts/5af5361ed4d1e8305780b100e1730cb09132f8d1.ttf diff --git a/test/shaping/data/in-house/fonts/5bb74492f5e0ffa1fbb72e4c881be035120b6513.ttf b/test/shape/data/in-house/fonts/5bb74492f5e0ffa1fbb72e4c881be035120b6513.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/5bb74492f5e0ffa1fbb72e4c881be035120b6513.ttf rename to test/shape/data/in-house/fonts/5bb74492f5e0ffa1fbb72e4c881be035120b6513.ttf diff --git a/test/shaping/data/in-house/fonts/5dfad7735c6a67085f1b90d4d497e32907db4c78.ttf b/test/shape/data/in-house/fonts/5dfad7735c6a67085f1b90d4d497e32907db4c78.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/5dfad7735c6a67085f1b90d4d497e32907db4c78.ttf rename to test/shape/data/in-house/fonts/5dfad7735c6a67085f1b90d4d497e32907db4c78.ttf diff --git a/test/shaping/data/in-house/fonts/604026ae5aaca83c49cd8416909d71ba3e1c1194.ttf b/test/shape/data/in-house/fonts/604026ae5aaca83c49cd8416909d71ba3e1c1194.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/604026ae5aaca83c49cd8416909d71ba3e1c1194.ttf rename to test/shape/data/in-house/fonts/604026ae5aaca83c49cd8416909d71ba3e1c1194.ttf diff --git a/test/shaping/data/in-house/fonts/641ca9d7808b01cafa9a666c13811c9b56eb9c52.ttf b/test/shape/data/in-house/fonts/641ca9d7808b01cafa9a666c13811c9b56eb9c52.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/641ca9d7808b01cafa9a666c13811c9b56eb9c52.ttf rename to test/shape/data/in-house/fonts/641ca9d7808b01cafa9a666c13811c9b56eb9c52.ttf diff --git a/test/shaping/data/in-house/fonts/663aef6b019dbf45ffd74089e2b5f2496ceceb18.ttf b/test/shape/data/in-house/fonts/663aef6b019dbf45ffd74089e2b5f2496ceceb18.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/663aef6b019dbf45ffd74089e2b5f2496ceceb18.ttf rename to test/shape/data/in-house/fonts/663aef6b019dbf45ffd74089e2b5f2496ceceb18.ttf diff --git a/test/shaping/data/in-house/fonts/6677074106f94a2644da6aaaacd5bbd48cbdc7de.ttf b/test/shape/data/in-house/fonts/6677074106f94a2644da6aaaacd5bbd48cbdc7de.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/6677074106f94a2644da6aaaacd5bbd48cbdc7de.ttf rename to test/shape/data/in-house/fonts/6677074106f94a2644da6aaaacd5bbd48cbdc7de.ttf diff --git a/test/shaping/data/in-house/fonts/6991b13ce889466be6de3f66e891de2bc0f117ee.ttf b/test/shape/data/in-house/fonts/6991b13ce889466be6de3f66e891de2bc0f117ee.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/6991b13ce889466be6de3f66e891de2bc0f117ee.ttf rename to test/shape/data/in-house/fonts/6991b13ce889466be6de3f66e891de2bc0f117ee.ttf diff --git a/test/shaping/data/in-house/fonts/6f36d056bad6d478fc0bf7397bd52dc3bd197d5f.ttf b/test/shape/data/in-house/fonts/6f36d056bad6d478fc0bf7397bd52dc3bd197d5f.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/6f36d056bad6d478fc0bf7397bd52dc3bd197d5f.ttf rename to test/shape/data/in-house/fonts/6f36d056bad6d478fc0bf7397bd52dc3bd197d5f.ttf diff --git a/test/shaping/data/in-house/fonts/6ff0fbead4462d9f229167b4e6839eceb8465058.ttf b/test/shape/data/in-house/fonts/6ff0fbead4462d9f229167b4e6839eceb8465058.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/6ff0fbead4462d9f229167b4e6839eceb8465058.ttf rename to test/shape/data/in-house/fonts/6ff0fbead4462d9f229167b4e6839eceb8465058.ttf diff --git a/test/shaping/data/in-house/fonts/706c5d7b625f207bc0d874c67237aad6f1e9cd6f.ttf b/test/shape/data/in-house/fonts/706c5d7b625f207bc0d874c67237aad6f1e9cd6f.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/706c5d7b625f207bc0d874c67237aad6f1e9cd6f.ttf rename to test/shape/data/in-house/fonts/706c5d7b625f207bc0d874c67237aad6f1e9cd6f.ttf diff --git a/test/shaping/data/in-house/fonts/738d9f3b8c2dfd03875bf35a61d28fd78faf17c8.ttf b/test/shape/data/in-house/fonts/738d9f3b8c2dfd03875bf35a61d28fd78faf17c8.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/738d9f3b8c2dfd03875bf35a61d28fd78faf17c8.ttf rename to test/shape/data/in-house/fonts/738d9f3b8c2dfd03875bf35a61d28fd78faf17c8.ttf diff --git a/test/shaping/data/in-house/fonts/73e84dac2fc6a2d1bc9250d1414353661088937d.ttf b/test/shape/data/in-house/fonts/73e84dac2fc6a2d1bc9250d1414353661088937d.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/73e84dac2fc6a2d1bc9250d1414353661088937d.ttf rename to test/shape/data/in-house/fonts/73e84dac2fc6a2d1bc9250d1414353661088937d.ttf diff --git a/test/shaping/data/in-house/fonts/757ebd573617a24aa9dfbf0b885c54875c6fe06b.ttf b/test/shape/data/in-house/fonts/757ebd573617a24aa9dfbf0b885c54875c6fe06b.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/757ebd573617a24aa9dfbf0b885c54875c6fe06b.ttf rename to test/shape/data/in-house/fonts/757ebd573617a24aa9dfbf0b885c54875c6fe06b.ttf diff --git a/test/shaping/data/in-house/fonts/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf b/test/shape/data/in-house/fonts/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf rename to test/shape/data/in-house/fonts/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf diff --git a/test/shaping/data/in-house/fonts/7d18685e1529e4ceaad5b6095dfab2f9789e5bce.ttf b/test/shape/data/in-house/fonts/7d18685e1529e4ceaad5b6095dfab2f9789e5bce.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/7d18685e1529e4ceaad5b6095dfab2f9789e5bce.ttf rename to test/shape/data/in-house/fonts/7d18685e1529e4ceaad5b6095dfab2f9789e5bce.ttf diff --git a/test/shaping/data/in-house/fonts/7e14e7883ed152baa158b80e207b66114c823a8b.ttf b/test/shape/data/in-house/fonts/7e14e7883ed152baa158b80e207b66114c823a8b.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/7e14e7883ed152baa158b80e207b66114c823a8b.ttf rename to test/shape/data/in-house/fonts/7e14e7883ed152baa158b80e207b66114c823a8b.ttf diff --git a/test/shaping/data/in-house/fonts/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf b/test/shape/data/in-house/fonts/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf rename to test/shape/data/in-house/fonts/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf diff --git a/test/shaping/data/in-house/fonts/8116e5d8fedfbec74e45dc350d2416d810bed8c4.ttf b/test/shape/data/in-house/fonts/8116e5d8fedfbec74e45dc350d2416d810bed8c4.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/8116e5d8fedfbec74e45dc350d2416d810bed8c4.ttf rename to test/shape/data/in-house/fonts/8116e5d8fedfbec74e45dc350d2416d810bed8c4.ttf diff --git a/test/shaping/data/in-house/fonts/813c2f8e5512187fd982417a7fb4286728e6f4a8.ttf b/test/shape/data/in-house/fonts/813c2f8e5512187fd982417a7fb4286728e6f4a8.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/813c2f8e5512187fd982417a7fb4286728e6f4a8.ttf rename to test/shape/data/in-house/fonts/813c2f8e5512187fd982417a7fb4286728e6f4a8.ttf diff --git a/test/shaping/data/in-house/fonts/81c368a33816fb20e9f647e8f24e2180f4720263.ttf b/test/shape/data/in-house/fonts/81c368a33816fb20e9f647e8f24e2180f4720263.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/81c368a33816fb20e9f647e8f24e2180f4720263.ttf rename to test/shape/data/in-house/fonts/81c368a33816fb20e9f647e8f24e2180f4720263.ttf diff --git a/test/shaping/data/in-house/fonts/8228d035fcd65d62ec9728fb34f42c63be93a5d3.ttf b/test/shape/data/in-house/fonts/8228d035fcd65d62ec9728fb34f42c63be93a5d3.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/8228d035fcd65d62ec9728fb34f42c63be93a5d3.ttf rename to test/shape/data/in-house/fonts/8228d035fcd65d62ec9728fb34f42c63be93a5d3.ttf diff --git a/test/shaping/data/in-house/fonts/82f4f3b57bb55344e72e70231380202a52af5805.ttf b/test/shape/data/in-house/fonts/82f4f3b57bb55344e72e70231380202a52af5805.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/82f4f3b57bb55344e72e70231380202a52af5805.ttf rename to test/shape/data/in-house/fonts/82f4f3b57bb55344e72e70231380202a52af5805.ttf diff --git a/test/shaping/data/in-house/fonts/8454d22037f892e76614e1645d066689a0200e61.ttf b/test/shape/data/in-house/fonts/8454d22037f892e76614e1645d066689a0200e61.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/8454d22037f892e76614e1645d066689a0200e61.ttf rename to test/shape/data/in-house/fonts/8454d22037f892e76614e1645d066689a0200e61.ttf diff --git a/test/shaping/data/in-house/fonts/85414f2552b654585b7a8d13dcc3e8fd9f7970a3.ttf b/test/shape/data/in-house/fonts/85414f2552b654585b7a8d13dcc3e8fd9f7970a3.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/85414f2552b654585b7a8d13dcc3e8fd9f7970a3.ttf rename to test/shape/data/in-house/fonts/85414f2552b654585b7a8d13dcc3e8fd9f7970a3.ttf diff --git a/test/shaping/data/in-house/fonts/856ff9562451293cbeff6f396d4e3877c4f0a436.ttf b/test/shape/data/in-house/fonts/856ff9562451293cbeff6f396d4e3877c4f0a436.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/856ff9562451293cbeff6f396d4e3877c4f0a436.ttf rename to test/shape/data/in-house/fonts/856ff9562451293cbeff6f396d4e3877c4f0a436.ttf diff --git a/test/shaping/data/in-house/fonts/85fe0be440c64ac77699e21c2f1bd933a919167e.ttf b/test/shape/data/in-house/fonts/85fe0be440c64ac77699e21c2f1bd933a919167e.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/85fe0be440c64ac77699e21c2f1bd933a919167e.ttf rename to test/shape/data/in-house/fonts/85fe0be440c64ac77699e21c2f1bd933a919167e.ttf diff --git a/test/shaping/data/in-house/fonts/86cdd983c4e4c4d7f27dd405d6ceb7d4b9ed3d35.ttf b/test/shape/data/in-house/fonts/86cdd983c4e4c4d7f27dd405d6ceb7d4b9ed3d35.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/86cdd983c4e4c4d7f27dd405d6ceb7d4b9ed3d35.ttf rename to test/shape/data/in-house/fonts/86cdd983c4e4c4d7f27dd405d6ceb7d4b9ed3d35.ttf diff --git a/test/shaping/data/in-house/fonts/87f85d17d26f1fe9ad28d7365101958edaefb967.ttf b/test/shape/data/in-house/fonts/87f85d17d26f1fe9ad28d7365101958edaefb967.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/87f85d17d26f1fe9ad28d7365101958edaefb967.ttf rename to test/shape/data/in-house/fonts/87f85d17d26f1fe9ad28d7365101958edaefb967.ttf diff --git a/test/shaping/data/in-house/fonts/881642af1667ae30a54e58de8be904566d00508f.ttf b/test/shape/data/in-house/fonts/881642af1667ae30a54e58de8be904566d00508f.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/881642af1667ae30a54e58de8be904566d00508f.ttf rename to test/shape/data/in-house/fonts/881642af1667ae30a54e58de8be904566d00508f.ttf diff --git a/test/shaping/data/in-house/fonts/8a9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf b/test/shape/data/in-house/fonts/8a9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/8a9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf rename to test/shape/data/in-house/fonts/8a9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf diff --git a/test/shaping/data/in-house/fonts/8d9c4b193808b8bde94389ba7831c1fc6f9e794e.ttf b/test/shape/data/in-house/fonts/8d9c4b193808b8bde94389ba7831c1fc6f9e794e.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/8d9c4b193808b8bde94389ba7831c1fc6f9e794e.ttf rename to test/shape/data/in-house/fonts/8d9c4b193808b8bde94389ba7831c1fc6f9e794e.ttf diff --git a/test/shaping/data/in-house/fonts/932ad5132c2761297c74e9976fe25b08e5ffa10b.ttf b/test/shape/data/in-house/fonts/932ad5132c2761297c74e9976fe25b08e5ffa10b.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/932ad5132c2761297c74e9976fe25b08e5ffa10b.ttf rename to test/shape/data/in-house/fonts/932ad5132c2761297c74e9976fe25b08e5ffa10b.ttf diff --git a/test/shaping/data/in-house/fonts/94a5d6fb15a27521fba9ea4aee9cb39b2d03322a.ttf b/test/shape/data/in-house/fonts/94a5d6fb15a27521fba9ea4aee9cb39b2d03322a.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/94a5d6fb15a27521fba9ea4aee9cb39b2d03322a.ttf rename to test/shape/data/in-house/fonts/94a5d6fb15a27521fba9ea4aee9cb39b2d03322a.ttf diff --git a/test/shaping/data/in-house/fonts/96490dd2ff81233b335a650e7eb660e0e7b2eeea.ttf b/test/shape/data/in-house/fonts/96490dd2ff81233b335a650e7eb660e0e7b2eeea.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/96490dd2ff81233b335a650e7eb660e0e7b2eeea.ttf rename to test/shape/data/in-house/fonts/96490dd2ff81233b335a650e7eb660e0e7b2eeea.ttf diff --git a/test/shaping/data/in-house/fonts/98b7887cff91f722b92a8ff800120954606354f9.ttf b/test/shape/data/in-house/fonts/98b7887cff91f722b92a8ff800120954606354f9.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/98b7887cff91f722b92a8ff800120954606354f9.ttf rename to test/shape/data/in-house/fonts/98b7887cff91f722b92a8ff800120954606354f9.ttf diff --git a/test/shaping/data/in-house/fonts/9fc3e6960b3520e5304033ef5fd540285f72f14d.ttf b/test/shape/data/in-house/fonts/9fc3e6960b3520e5304033ef5fd540285f72f14d.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/9fc3e6960b3520e5304033ef5fd540285f72f14d.ttf rename to test/shape/data/in-house/fonts/9fc3e6960b3520e5304033ef5fd540285f72f14d.ttf diff --git a/test/shaping/data/in-house/fonts/AdobeBlank2.ttf b/test/shape/data/in-house/fonts/AdobeBlank2.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/AdobeBlank2.ttf rename to test/shape/data/in-house/fonts/AdobeBlank2.ttf diff --git a/test/shaping/data/in-house/fonts/DFONT.dfont b/test/shape/data/in-house/fonts/DFONT.dfont similarity index 100% rename from test/shaping/data/in-house/fonts/DFONT.dfont rename to test/shape/data/in-house/fonts/DFONT.dfont diff --git a/test/shaping/data/in-house/fonts/HBTest-VF.ttf b/test/shape/data/in-house/fonts/HBTest-VF.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/HBTest-VF.ttf rename to test/shape/data/in-house/fonts/HBTest-VF.ttf diff --git a/test/shaping/data/in-house/fonts/MORXTwentyeight.ttf b/test/shape/data/in-house/fonts/MORXTwentyeight.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/MORXTwentyeight.ttf rename to test/shape/data/in-house/fonts/MORXTwentyeight.ttf diff --git a/test/shaping/data/in-house/fonts/TRAK.ttf b/test/shape/data/in-house/fonts/TRAK.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/TRAK.ttf rename to test/shape/data/in-house/fonts/TRAK.ttf diff --git a/test/shaping/data/in-house/fonts/TTC.ttc b/test/shape/data/in-house/fonts/TTC.ttc similarity index 100% rename from test/shaping/data/in-house/fonts/TTC.ttc rename to test/shape/data/in-house/fonts/TTC.ttc diff --git a/test/shaping/data/in-house/fonts/a014549f766436cf55b2ceb40e462038938ee899.ttf b/test/shape/data/in-house/fonts/a014549f766436cf55b2ceb40e462038938ee899.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/a014549f766436cf55b2ceb40e462038938ee899.ttf rename to test/shape/data/in-house/fonts/a014549f766436cf55b2ceb40e462038938ee899.ttf diff --git a/test/shaping/data/in-house/fonts/a02a7f0ad42c2922cb37ad1358c9df4eb81f1bca.ttf b/test/shape/data/in-house/fonts/a02a7f0ad42c2922cb37ad1358c9df4eb81f1bca.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/a02a7f0ad42c2922cb37ad1358c9df4eb81f1bca.ttf rename to test/shape/data/in-house/fonts/a02a7f0ad42c2922cb37ad1358c9df4eb81f1bca.ttf diff --git a/test/shaping/data/in-house/fonts/a34a7b00f22ffb5fd7eef6933b81c7e71bc2cdfb.ttf b/test/shape/data/in-house/fonts/a34a7b00f22ffb5fd7eef6933b81c7e71bc2cdfb.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/a34a7b00f22ffb5fd7eef6933b81c7e71bc2cdfb.ttf rename to test/shape/data/in-house/fonts/a34a7b00f22ffb5fd7eef6933b81c7e71bc2cdfb.ttf diff --git a/test/shaping/data/in-house/fonts/a6b17da98b9f1565ba428719777bbf94a66403c1.ttf b/test/shape/data/in-house/fonts/a6b17da98b9f1565ba428719777bbf94a66403c1.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/a6b17da98b9f1565ba428719777bbf94a66403c1.ttf rename to test/shape/data/in-house/fonts/a6b17da98b9f1565ba428719777bbf94a66403c1.ttf diff --git a/test/shaping/data/in-house/fonts/a6c76d1bafde4a0b1026ebcc932d2e5c6fd02442.ttf b/test/shape/data/in-house/fonts/a6c76d1bafde4a0b1026ebcc932d2e5c6fd02442.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/a6c76d1bafde4a0b1026ebcc932d2e5c6fd02442.ttf rename to test/shape/data/in-house/fonts/a6c76d1bafde4a0b1026ebcc932d2e5c6fd02442.ttf diff --git a/test/shaping/data/in-house/fonts/a706511c65fb278fda87eaf2180ca6684a80f423.ttf b/test/shape/data/in-house/fonts/a706511c65fb278fda87eaf2180ca6684a80f423.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/a706511c65fb278fda87eaf2180ca6684a80f423.ttf rename to test/shape/data/in-house/fonts/a706511c65fb278fda87eaf2180ca6684a80f423.ttf diff --git a/test/shaping/data/in-house/fonts/a919b33197965846f21074b24e30250d67277bce.ttf b/test/shape/data/in-house/fonts/a919b33197965846f21074b24e30250d67277bce.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/a919b33197965846f21074b24e30250d67277bce.ttf rename to test/shape/data/in-house/fonts/a919b33197965846f21074b24e30250d67277bce.ttf diff --git a/test/shaping/data/in-house/fonts/a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf b/test/shape/data/in-house/fonts/a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf rename to test/shape/data/in-house/fonts/a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf diff --git a/test/shaping/data/in-house/fonts/ab14b4eb9d7a67e293f51d30d719add06c9d6e06.ttf b/test/shape/data/in-house/fonts/ab14b4eb9d7a67e293f51d30d719add06c9d6e06.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/ab14b4eb9d7a67e293f51d30d719add06c9d6e06.ttf rename to test/shape/data/in-house/fonts/ab14b4eb9d7a67e293f51d30d719add06c9d6e06.ttf diff --git a/test/shaping/data/in-house/fonts/ab40c89624a6104e5d0a2308e448a989302f515b.ttf b/test/shape/data/in-house/fonts/ab40c89624a6104e5d0a2308e448a989302f515b.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/ab40c89624a6104e5d0a2308e448a989302f515b.ttf rename to test/shape/data/in-house/fonts/ab40c89624a6104e5d0a2308e448a989302f515b.ttf diff --git a/test/shaping/data/in-house/fonts/ad01ab2ea1cb1a4d3a2783e2675112ef11ae6404.ttf b/test/shape/data/in-house/fonts/ad01ab2ea1cb1a4d3a2783e2675112ef11ae6404.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/ad01ab2ea1cb1a4d3a2783e2675112ef11ae6404.ttf rename to test/shape/data/in-house/fonts/ad01ab2ea1cb1a4d3a2783e2675112ef11ae6404.ttf diff --git a/test/shaping/data/in-house/fonts/af3086380b743099c54a3b11b96766039ea62fcd.ttf b/test/shape/data/in-house/fonts/af3086380b743099c54a3b11b96766039ea62fcd.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/af3086380b743099c54a3b11b96766039ea62fcd.ttf rename to test/shape/data/in-house/fonts/af3086380b743099c54a3b11b96766039ea62fcd.ttf diff --git a/test/shaping/data/in-house/fonts/af85624080af5627fb050f570d148a62f04fda74.ttf b/test/shape/data/in-house/fonts/af85624080af5627fb050f570d148a62f04fda74.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/af85624080af5627fb050f570d148a62f04fda74.ttf rename to test/shape/data/in-house/fonts/af85624080af5627fb050f570d148a62f04fda74.ttf diff --git a/test/shaping/data/in-house/fonts/b082211be29a3e2cf91f0fd43497e40b2a27b344.ttf b/test/shape/data/in-house/fonts/b082211be29a3e2cf91f0fd43497e40b2a27b344.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/b082211be29a3e2cf91f0fd43497e40b2a27b344.ttf rename to test/shape/data/in-house/fonts/b082211be29a3e2cf91f0fd43497e40b2a27b344.ttf diff --git a/test/shaping/data/in-house/fonts/b121d4306b2e3add5abbaad21d95fcf04aacbd64.ttf b/test/shape/data/in-house/fonts/b121d4306b2e3add5abbaad21d95fcf04aacbd64.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/b121d4306b2e3add5abbaad21d95fcf04aacbd64.ttf rename to test/shape/data/in-house/fonts/b121d4306b2e3add5abbaad21d95fcf04aacbd64.ttf diff --git a/test/shaping/data/in-house/fonts/b151cfcdaa77585d77f17a42158e0873fc8e2633.ttf b/test/shape/data/in-house/fonts/b151cfcdaa77585d77f17a42158e0873fc8e2633.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/b151cfcdaa77585d77f17a42158e0873fc8e2633.ttf rename to test/shape/data/in-house/fonts/b151cfcdaa77585d77f17a42158e0873fc8e2633.ttf diff --git a/test/shaping/data/in-house/fonts/b3075ca42b27dde7341c2d0ae16703c5b6640df0.ttf b/test/shape/data/in-house/fonts/b3075ca42b27dde7341c2d0ae16703c5b6640df0.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/b3075ca42b27dde7341c2d0ae16703c5b6640df0.ttf rename to test/shape/data/in-house/fonts/b3075ca42b27dde7341c2d0ae16703c5b6640df0.ttf diff --git a/test/shaping/data/in-house/fonts/b31e6c52a31edadc16f1bec9efe6019e2d59824a.ttf b/test/shape/data/in-house/fonts/b31e6c52a31edadc16f1bec9efe6019e2d59824a.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/b31e6c52a31edadc16f1bec9efe6019e2d59824a.ttf rename to test/shape/data/in-house/fonts/b31e6c52a31edadc16f1bec9efe6019e2d59824a.ttf diff --git a/test/shaping/data/in-house/fonts/b6031119874ae9ff1dd65383a335e361c0962220.ttf b/test/shape/data/in-house/fonts/b6031119874ae9ff1dd65383a335e361c0962220.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/b6031119874ae9ff1dd65383a335e361c0962220.ttf rename to test/shape/data/in-house/fonts/b6031119874ae9ff1dd65383a335e361c0962220.ttf diff --git a/test/shaping/data/in-house/fonts/b722a7d09e60421f3efbc706ad348ab47b88567b.ttf b/test/shape/data/in-house/fonts/b722a7d09e60421f3efbc706ad348ab47b88567b.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/b722a7d09e60421f3efbc706ad348ab47b88567b.ttf rename to test/shape/data/in-house/fonts/b722a7d09e60421f3efbc706ad348ab47b88567b.ttf diff --git a/test/shaping/data/in-house/fonts/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf b/test/shape/data/in-house/fonts/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf rename to test/shape/data/in-house/fonts/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf diff --git a/test/shaping/data/in-house/fonts/bb9473d2403488714043bcfb946c9f78b86ad627.ttf b/test/shape/data/in-house/fonts/bb9473d2403488714043bcfb946c9f78b86ad627.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/bb9473d2403488714043bcfb946c9f78b86ad627.ttf rename to test/shape/data/in-house/fonts/bb9473d2403488714043bcfb946c9f78b86ad627.ttf diff --git a/test/shaping/data/in-house/fonts/bf39b0e91ef9807f15a9e283a21a14a209fd2cfc.ttf b/test/shape/data/in-house/fonts/bf39b0e91ef9807f15a9e283a21a14a209fd2cfc.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/bf39b0e91ef9807f15a9e283a21a14a209fd2cfc.ttf rename to test/shape/data/in-house/fonts/bf39b0e91ef9807f15a9e283a21a14a209fd2cfc.ttf diff --git a/test/shaping/data/in-house/fonts/bf962d3202883a820aed019d9b5c1838c2ff69c6.ttf b/test/shape/data/in-house/fonts/bf962d3202883a820aed019d9b5c1838c2ff69c6.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/bf962d3202883a820aed019d9b5c1838c2ff69c6.ttf rename to test/shape/data/in-house/fonts/bf962d3202883a820aed019d9b5c1838c2ff69c6.ttf diff --git a/test/shaping/data/in-house/fonts/c4e48b0886ef460f532fb49f00047ec92c432ec0.ttf b/test/shape/data/in-house/fonts/c4e48b0886ef460f532fb49f00047ec92c432ec0.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/c4e48b0886ef460f532fb49f00047ec92c432ec0.ttf rename to test/shape/data/in-house/fonts/c4e48b0886ef460f532fb49f00047ec92c432ec0.ttf diff --git a/test/shaping/data/in-house/fonts/cc5f3d2d717fb6bd4dfae1c16d48a2cb8e12233b.ttf b/test/shape/data/in-house/fonts/cc5f3d2d717fb6bd4dfae1c16d48a2cb8e12233b.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/cc5f3d2d717fb6bd4dfae1c16d48a2cb8e12233b.ttf rename to test/shape/data/in-house/fonts/cc5f3d2d717fb6bd4dfae1c16d48a2cb8e12233b.ttf diff --git a/test/shaping/data/in-house/fonts/d23d76ea0909c14972796937ba072b5a40c1e257.ttf b/test/shape/data/in-house/fonts/d23d76ea0909c14972796937ba072b5a40c1e257.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/d23d76ea0909c14972796937ba072b5a40c1e257.ttf rename to test/shape/data/in-house/fonts/d23d76ea0909c14972796937ba072b5a40c1e257.ttf diff --git a/test/shaping/data/in-house/fonts/d3129450fafe5e5c98cfc25a4e71809b1b4d2855.ttf b/test/shape/data/in-house/fonts/d3129450fafe5e5c98cfc25a4e71809b1b4d2855.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/d3129450fafe5e5c98cfc25a4e71809b1b4d2855.ttf rename to test/shape/data/in-house/fonts/d3129450fafe5e5c98cfc25a4e71809b1b4d2855.ttf diff --git a/test/shaping/data/in-house/fonts/d629e7fedc0b350222d7987345fe61613fa3929a.ttf b/test/shape/data/in-house/fonts/d629e7fedc0b350222d7987345fe61613fa3929a.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/d629e7fedc0b350222d7987345fe61613fa3929a.ttf rename to test/shape/data/in-house/fonts/d629e7fedc0b350222d7987345fe61613fa3929a.ttf diff --git a/test/shaping/data/in-house/fonts/d9b8bc10985f24796826c29f7ccba3d0ae11ec02.ttf b/test/shape/data/in-house/fonts/d9b8bc10985f24796826c29f7ccba3d0ae11ec02.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/d9b8bc10985f24796826c29f7ccba3d0ae11ec02.ttf rename to test/shape/data/in-house/fonts/d9b8bc10985f24796826c29f7ccba3d0ae11ec02.ttf diff --git a/test/shaping/data/in-house/fonts/dcf774ca21062e7439f98658b18974ea8b956d0c.ttf b/test/shape/data/in-house/fonts/dcf774ca21062e7439f98658b18974ea8b956d0c.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/dcf774ca21062e7439f98658b18974ea8b956d0c.ttf rename to test/shape/data/in-house/fonts/dcf774ca21062e7439f98658b18974ea8b956d0c.ttf diff --git a/test/shaping/data/in-house/fonts/df768b9c257e0c9c35786c47cae15c46571d56be.ttf b/test/shape/data/in-house/fonts/df768b9c257e0c9c35786c47cae15c46571d56be.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/df768b9c257e0c9c35786c47cae15c46571d56be.ttf rename to test/shape/data/in-house/fonts/df768b9c257e0c9c35786c47cae15c46571d56be.ttf diff --git a/test/shaping/data/in-house/fonts/e207635780b42f898d58654b65098763e340f5c7.ttf b/test/shape/data/in-house/fonts/e207635780b42f898d58654b65098763e340f5c7.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/e207635780b42f898d58654b65098763e340f5c7.ttf rename to test/shape/data/in-house/fonts/e207635780b42f898d58654b65098763e340f5c7.ttf diff --git a/test/shaping/data/in-house/fonts/e39391c77a6321c2ac7a2d644de0396470cd4bfe.ttf b/test/shape/data/in-house/fonts/e39391c77a6321c2ac7a2d644de0396470cd4bfe.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/e39391c77a6321c2ac7a2d644de0396470cd4bfe.ttf rename to test/shape/data/in-house/fonts/e39391c77a6321c2ac7a2d644de0396470cd4bfe.ttf diff --git a/test/shaping/data/in-house/fonts/e5ff44940364c2247abed50bdda30d2ef5aedfe4.ttf b/test/shape/data/in-house/fonts/e5ff44940364c2247abed50bdda30d2ef5aedfe4.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/e5ff44940364c2247abed50bdda30d2ef5aedfe4.ttf rename to test/shape/data/in-house/fonts/e5ff44940364c2247abed50bdda30d2ef5aedfe4.ttf diff --git a/test/shaping/data/in-house/fonts/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf b/test/shape/data/in-house/fonts/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf rename to test/shape/data/in-house/fonts/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf diff --git a/test/shaping/data/in-house/fonts/e8691822f6a705e3e9fb48a0405c645b1a036590.ttf b/test/shape/data/in-house/fonts/e8691822f6a705e3e9fb48a0405c645b1a036590.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/e8691822f6a705e3e9fb48a0405c645b1a036590.ttf rename to test/shape/data/in-house/fonts/e8691822f6a705e3e9fb48a0405c645b1a036590.ttf diff --git a/test/shaping/data/in-house/fonts/ea3f63620511b2097200d23774ffef197e829e69.ttf b/test/shape/data/in-house/fonts/ea3f63620511b2097200d23774ffef197e829e69.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/ea3f63620511b2097200d23774ffef197e829e69.ttf rename to test/shape/data/in-house/fonts/ea3f63620511b2097200d23774ffef197e829e69.ttf diff --git a/test/shaping/data/in-house/fonts/ee39587d13b2afa5499cc79e45780aa79293bbd4.ttf b/test/shape/data/in-house/fonts/ee39587d13b2afa5499cc79e45780aa79293bbd4.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/ee39587d13b2afa5499cc79e45780aa79293bbd4.ttf rename to test/shape/data/in-house/fonts/ee39587d13b2afa5499cc79e45780aa79293bbd4.ttf diff --git a/test/shaping/data/in-house/fonts/ef86fe710cfea877bbe0dbb6946a1f88d0661031.ttf b/test/shape/data/in-house/fonts/ef86fe710cfea877bbe0dbb6946a1f88d0661031.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/ef86fe710cfea877bbe0dbb6946a1f88d0661031.ttf rename to test/shape/data/in-house/fonts/ef86fe710cfea877bbe0dbb6946a1f88d0661031.ttf diff --git a/test/shaping/data/in-house/fonts/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf b/test/shape/data/in-house/fonts/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf rename to test/shape/data/in-house/fonts/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf diff --git a/test/shaping/data/in-house/fonts/f443753e8ffe8e8aae606cfba158e00334b6efb1.ttf b/test/shape/data/in-house/fonts/f443753e8ffe8e8aae606cfba158e00334b6efb1.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/f443753e8ffe8e8aae606cfba158e00334b6efb1.ttf rename to test/shape/data/in-house/fonts/f443753e8ffe8e8aae606cfba158e00334b6efb1.ttf diff --git a/test/shaping/data/in-house/fonts/f499fbc23865022234775c43503bba2e63978fe1.ttf b/test/shape/data/in-house/fonts/f499fbc23865022234775c43503bba2e63978fe1.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/f499fbc23865022234775c43503bba2e63978fe1.ttf rename to test/shape/data/in-house/fonts/f499fbc23865022234775c43503bba2e63978fe1.ttf diff --git a/test/shaping/data/in-house/fonts/f518eb6f6b5eec2946c9fbbbde44e45d46f5e2ac.ttf b/test/shape/data/in-house/fonts/f518eb6f6b5eec2946c9fbbbde44e45d46f5e2ac.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/f518eb6f6b5eec2946c9fbbbde44e45d46f5e2ac.ttf rename to test/shape/data/in-house/fonts/f518eb6f6b5eec2946c9fbbbde44e45d46f5e2ac.ttf diff --git a/test/shaping/data/in-house/fonts/f75c4b05a0a4d67c1a808081ae3d74a9c66509e8.ttf b/test/shape/data/in-house/fonts/f75c4b05a0a4d67c1a808081ae3d74a9c66509e8.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/f75c4b05a0a4d67c1a808081ae3d74a9c66509e8.ttf rename to test/shape/data/in-house/fonts/f75c4b05a0a4d67c1a808081ae3d74a9c66509e8.ttf diff --git a/test/shaping/data/in-house/fonts/f79eb71df4e4c9c273b67b89a06e5ff9e3c1f834.ttf b/test/shape/data/in-house/fonts/f79eb71df4e4c9c273b67b89a06e5ff9e3c1f834.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/f79eb71df4e4c9c273b67b89a06e5ff9e3c1f834.ttf rename to test/shape/data/in-house/fonts/f79eb71df4e4c9c273b67b89a06e5ff9e3c1f834.ttf diff --git a/test/shaping/data/in-house/fonts/f9b1dd4dcb515e757789a22cb4241107746fd3d0.ttf b/test/shape/data/in-house/fonts/f9b1dd4dcb515e757789a22cb4241107746fd3d0.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/f9b1dd4dcb515e757789a22cb4241107746fd3d0.ttf rename to test/shape/data/in-house/fonts/f9b1dd4dcb515e757789a22cb4241107746fd3d0.ttf diff --git a/test/shaping/data/in-house/fonts/fbb6c84c9e1fe0c39e152fbe845e51fd81f6748e.ttf b/test/shape/data/in-house/fonts/fbb6c84c9e1fe0c39e152fbe845e51fd81f6748e.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/fbb6c84c9e1fe0c39e152fbe845e51fd81f6748e.ttf rename to test/shape/data/in-house/fonts/fbb6c84c9e1fe0c39e152fbe845e51fd81f6748e.ttf diff --git a/test/shaping/data/in-house/fonts/fcbaa518d3cce441ed37ae3b1fed6a19e9b54efd.ttf b/test/shape/data/in-house/fonts/fcbaa518d3cce441ed37ae3b1fed6a19e9b54efd.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/fcbaa518d3cce441ed37ae3b1fed6a19e9b54efd.ttf rename to test/shape/data/in-house/fonts/fcbaa518d3cce441ed37ae3b1fed6a19e9b54efd.ttf diff --git a/test/shaping/data/in-house/fonts/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf b/test/shape/data/in-house/fonts/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf rename to test/shape/data/in-house/fonts/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf diff --git a/test/shaping/data/in-house/fonts/fcea341ba6489536390384d8403ce5287ba71a4a.ttf b/test/shape/data/in-house/fonts/fcea341ba6489536390384d8403ce5287ba71a4a.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/fcea341ba6489536390384d8403ce5287ba71a4a.ttf rename to test/shape/data/in-house/fonts/fcea341ba6489536390384d8403ce5287ba71a4a.ttf diff --git a/test/shaping/data/in-house/fonts/fd07ea46e4d8368ada1776208c07fd596f727852.ttf b/test/shape/data/in-house/fonts/fd07ea46e4d8368ada1776208c07fd596f727852.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/fd07ea46e4d8368ada1776208c07fd596f727852.ttf rename to test/shape/data/in-house/fonts/fd07ea46e4d8368ada1776208c07fd596f727852.ttf diff --git a/test/shaping/data/in-house/fonts/ffa0f5d2d9025486d8469d8b1fdd983e7632499b.ttf b/test/shape/data/in-house/fonts/ffa0f5d2d9025486d8469d8b1fdd983e7632499b.ttf similarity index 100% rename from test/shaping/data/in-house/fonts/ffa0f5d2d9025486d8469d8b1fdd983e7632499b.ttf rename to test/shape/data/in-house/fonts/ffa0f5d2d9025486d8469d8b1fdd983e7632499b.ttf diff --git a/test/shaping/data/in-house/meson.build b/test/shape/data/in-house/meson.build similarity index 100% rename from test/shaping/data/in-house/meson.build rename to test/shape/data/in-house/meson.build diff --git a/test/shaping/data/in-house/tests/aat-morx.tests b/test/shape/data/in-house/tests/aat-morx.tests similarity index 100% rename from test/shaping/data/in-house/tests/aat-morx.tests rename to test/shape/data/in-house/tests/aat-morx.tests diff --git a/test/shaping/data/in-house/tests/aat-trak.tests b/test/shape/data/in-house/tests/aat-trak.tests similarity index 100% rename from test/shaping/data/in-house/tests/aat-trak.tests rename to test/shape/data/in-house/tests/aat-trak.tests diff --git a/test/shaping/data/in-house/tests/arabic-fallback-shaping.tests b/test/shape/data/in-house/tests/arabic-fallback-shaping.tests similarity index 100% rename from test/shaping/data/in-house/tests/arabic-fallback-shaping.tests rename to test/shape/data/in-house/tests/arabic-fallback-shaping.tests diff --git a/test/shaping/data/in-house/tests/arabic-feature-order.tests b/test/shape/data/in-house/tests/arabic-feature-order.tests similarity index 100% rename from test/shaping/data/in-house/tests/arabic-feature-order.tests rename to test/shape/data/in-house/tests/arabic-feature-order.tests diff --git a/test/shaping/data/in-house/tests/arabic-like-joining.tests b/test/shape/data/in-house/tests/arabic-like-joining.tests similarity index 100% rename from test/shaping/data/in-house/tests/arabic-like-joining.tests rename to test/shape/data/in-house/tests/arabic-like-joining.tests diff --git a/test/shaping/data/in-house/tests/arabic-mark-attach.tests b/test/shape/data/in-house/tests/arabic-mark-attach.tests similarity index 100% rename from test/shaping/data/in-house/tests/arabic-mark-attach.tests rename to test/shape/data/in-house/tests/arabic-mark-attach.tests diff --git a/test/shaping/data/in-house/tests/arabic-mark-order.tests b/test/shape/data/in-house/tests/arabic-mark-order.tests similarity index 100% rename from test/shaping/data/in-house/tests/arabic-mark-order.tests rename to test/shape/data/in-house/tests/arabic-mark-order.tests diff --git a/test/shaping/data/in-house/tests/arabic-stch.tests b/test/shape/data/in-house/tests/arabic-stch.tests similarity index 100% rename from test/shaping/data/in-house/tests/arabic-stch.tests rename to test/shape/data/in-house/tests/arabic-stch.tests diff --git a/test/shaping/data/in-house/tests/automatic-fractions.tests b/test/shape/data/in-house/tests/automatic-fractions.tests similarity index 100% rename from test/shaping/data/in-house/tests/automatic-fractions.tests rename to test/shape/data/in-house/tests/automatic-fractions.tests diff --git a/test/shaping/data/in-house/tests/cluster.tests b/test/shape/data/in-house/tests/cluster.tests similarity index 100% rename from test/shaping/data/in-house/tests/cluster.tests rename to test/shape/data/in-house/tests/cluster.tests diff --git a/test/shaping/data/in-house/tests/collections.tests b/test/shape/data/in-house/tests/collections.tests similarity index 100% rename from test/shaping/data/in-house/tests/collections.tests rename to test/shape/data/in-house/tests/collections.tests diff --git a/test/shaping/data/in-house/tests/color-fonts.tests b/test/shape/data/in-house/tests/color-fonts.tests similarity index 100% rename from test/shaping/data/in-house/tests/color-fonts.tests rename to test/shape/data/in-house/tests/color-fonts.tests diff --git a/test/shaping/data/in-house/tests/context-matching.tests b/test/shape/data/in-house/tests/context-matching.tests similarity index 100% rename from test/shaping/data/in-house/tests/context-matching.tests rename to test/shape/data/in-house/tests/context-matching.tests diff --git a/test/shaping/data/in-house/tests/cursive-positioning.tests b/test/shape/data/in-house/tests/cursive-positioning.tests similarity index 100% rename from test/shaping/data/in-house/tests/cursive-positioning.tests rename to test/shape/data/in-house/tests/cursive-positioning.tests diff --git a/test/shaping/data/in-house/tests/default-ignorables.tests b/test/shape/data/in-house/tests/default-ignorables.tests similarity index 100% rename from test/shaping/data/in-house/tests/default-ignorables.tests rename to test/shape/data/in-house/tests/default-ignorables.tests diff --git a/test/shaping/data/in-house/tests/digits.tests b/test/shape/data/in-house/tests/digits.tests similarity index 100% rename from test/shaping/data/in-house/tests/digits.tests rename to test/shape/data/in-house/tests/digits.tests diff --git a/test/shaping/data/in-house/tests/emoji-clusters.tests b/test/shape/data/in-house/tests/emoji-clusters.tests similarity index 100% rename from test/shaping/data/in-house/tests/emoji-clusters.tests rename to test/shape/data/in-house/tests/emoji-clusters.tests diff --git a/test/shaping/data/in-house/tests/emoji.tests b/test/shape/data/in-house/tests/emoji.tests similarity index 100% rename from test/shaping/data/in-house/tests/emoji.tests rename to test/shape/data/in-house/tests/emoji.tests diff --git a/test/shaping/data/in-house/tests/fallback-positioning.tests b/test/shape/data/in-house/tests/fallback-positioning.tests similarity index 100% rename from test/shaping/data/in-house/tests/fallback-positioning.tests rename to test/shape/data/in-house/tests/fallback-positioning.tests diff --git a/test/shaping/data/in-house/tests/hangul-jamo.tests b/test/shape/data/in-house/tests/hangul-jamo.tests similarity index 100% rename from test/shaping/data/in-house/tests/hangul-jamo.tests rename to test/shape/data/in-house/tests/hangul-jamo.tests diff --git a/test/shaping/data/in-house/tests/hyphens.tests b/test/shape/data/in-house/tests/hyphens.tests similarity index 100% rename from test/shaping/data/in-house/tests/hyphens.tests rename to test/shape/data/in-house/tests/hyphens.tests diff --git a/test/shaping/data/in-house/tests/indic-consonant-with-stacker.tests b/test/shape/data/in-house/tests/indic-consonant-with-stacker.tests similarity index 100% rename from test/shaping/data/in-house/tests/indic-consonant-with-stacker.tests rename to test/shape/data/in-house/tests/indic-consonant-with-stacker.tests diff --git a/test/shaping/data/in-house/tests/indic-decompose.tests b/test/shape/data/in-house/tests/indic-decompose.tests similarity index 100% rename from test/shaping/data/in-house/tests/indic-decompose.tests rename to test/shape/data/in-house/tests/indic-decompose.tests diff --git a/test/shaping/data/in-house/tests/indic-init.tests b/test/shape/data/in-house/tests/indic-init.tests similarity index 100% rename from test/shaping/data/in-house/tests/indic-init.tests rename to test/shape/data/in-house/tests/indic-init.tests diff --git a/test/shaping/data/in-house/tests/indic-joiner-candrabindu.tests b/test/shape/data/in-house/tests/indic-joiner-candrabindu.tests similarity index 100% rename from test/shaping/data/in-house/tests/indic-joiner-candrabindu.tests rename to test/shape/data/in-house/tests/indic-joiner-candrabindu.tests diff --git a/test/shaping/data/in-house/tests/indic-joiners.tests b/test/shape/data/in-house/tests/indic-joiners.tests similarity index 100% rename from test/shaping/data/in-house/tests/indic-joiners.tests rename to test/shape/data/in-house/tests/indic-joiners.tests diff --git a/test/shaping/data/in-house/tests/indic-old-spec.tests b/test/shape/data/in-house/tests/indic-old-spec.tests similarity index 100% rename from test/shaping/data/in-house/tests/indic-old-spec.tests rename to test/shape/data/in-house/tests/indic-old-spec.tests diff --git a/test/shaping/data/in-house/tests/indic-pref-blocking.tests b/test/shape/data/in-house/tests/indic-pref-blocking.tests similarity index 100% rename from test/shaping/data/in-house/tests/indic-pref-blocking.tests rename to test/shape/data/in-house/tests/indic-pref-blocking.tests diff --git a/test/shaping/data/in-house/tests/indic-script-extensions.tests b/test/shape/data/in-house/tests/indic-script-extensions.tests similarity index 100% rename from test/shaping/data/in-house/tests/indic-script-extensions.tests rename to test/shape/data/in-house/tests/indic-script-extensions.tests diff --git a/test/shaping/data/in-house/tests/indic-special-cases.tests b/test/shape/data/in-house/tests/indic-special-cases.tests similarity index 100% rename from test/shaping/data/in-house/tests/indic-special-cases.tests rename to test/shape/data/in-house/tests/indic-special-cases.tests diff --git a/test/shaping/data/in-house/tests/indic-syllable.tests b/test/shape/data/in-house/tests/indic-syllable.tests similarity index 100% rename from test/shaping/data/in-house/tests/indic-syllable.tests rename to test/shape/data/in-house/tests/indic-syllable.tests diff --git a/test/shaping/data/in-house/tests/indic-vowel-letter-spoofing.tests b/test/shape/data/in-house/tests/indic-vowel-letter-spoofing.tests similarity index 100% rename from test/shaping/data/in-house/tests/indic-vowel-letter-spoofing.tests rename to test/shape/data/in-house/tests/indic-vowel-letter-spoofing.tests diff --git a/test/shaping/data/in-house/tests/kern-format2.tests b/test/shape/data/in-house/tests/kern-format2.tests similarity index 100% rename from test/shaping/data/in-house/tests/kern-format2.tests rename to test/shape/data/in-house/tests/kern-format2.tests diff --git a/test/shaping/data/in-house/tests/khmer-mark-order.tests b/test/shape/data/in-house/tests/khmer-mark-order.tests similarity index 100% rename from test/shaping/data/in-house/tests/khmer-mark-order.tests rename to test/shape/data/in-house/tests/khmer-mark-order.tests diff --git a/test/shaping/data/in-house/tests/khmer-misc.tests b/test/shape/data/in-house/tests/khmer-misc.tests similarity index 100% rename from test/shaping/data/in-house/tests/khmer-misc.tests rename to test/shape/data/in-house/tests/khmer-misc.tests diff --git a/test/shaping/data/in-house/tests/language-tags.tests b/test/shape/data/in-house/tests/language-tags.tests similarity index 100% rename from test/shaping/data/in-house/tests/language-tags.tests rename to test/shape/data/in-house/tests/language-tags.tests diff --git a/test/shaping/data/in-house/tests/ligature-id.tests b/test/shape/data/in-house/tests/ligature-id.tests similarity index 100% rename from test/shaping/data/in-house/tests/ligature-id.tests rename to test/shape/data/in-house/tests/ligature-id.tests diff --git a/test/shaping/data/in-house/tests/macos.tests b/test/shape/data/in-house/tests/macos.tests similarity index 100% rename from test/shaping/data/in-house/tests/macos.tests rename to test/shape/data/in-house/tests/macos.tests diff --git a/test/shaping/data/in-house/tests/mark-attachment.tests b/test/shape/data/in-house/tests/mark-attachment.tests similarity index 100% rename from test/shaping/data/in-house/tests/mark-attachment.tests rename to test/shape/data/in-house/tests/mark-attachment.tests diff --git a/test/shaping/data/in-house/tests/mark-filtering-sets.tests b/test/shape/data/in-house/tests/mark-filtering-sets.tests similarity index 100% rename from test/shaping/data/in-house/tests/mark-filtering-sets.tests rename to test/shape/data/in-house/tests/mark-filtering-sets.tests diff --git a/test/shaping/data/in-house/tests/mongolian-variation-selector.tests b/test/shape/data/in-house/tests/mongolian-variation-selector.tests similarity index 100% rename from test/shaping/data/in-house/tests/mongolian-variation-selector.tests rename to test/shape/data/in-house/tests/mongolian-variation-selector.tests diff --git a/test/shaping/data/in-house/tests/myanmar-misc.tests b/test/shape/data/in-house/tests/myanmar-misc.tests similarity index 100% rename from test/shaping/data/in-house/tests/myanmar-misc.tests rename to test/shape/data/in-house/tests/myanmar-misc.tests diff --git a/test/shaping/data/in-house/tests/myanmar-syllable.tests b/test/shape/data/in-house/tests/myanmar-syllable.tests similarity index 100% rename from test/shaping/data/in-house/tests/myanmar-syllable.tests rename to test/shape/data/in-house/tests/myanmar-syllable.tests diff --git a/test/shaping/data/in-house/tests/myanmar-zawgyi.tests b/test/shape/data/in-house/tests/myanmar-zawgyi.tests similarity index 100% rename from test/shaping/data/in-house/tests/myanmar-zawgyi.tests rename to test/shape/data/in-house/tests/myanmar-zawgyi.tests diff --git a/test/shaping/data/in-house/tests/none-directional.tests b/test/shape/data/in-house/tests/none-directional.tests similarity index 100% rename from test/shaping/data/in-house/tests/none-directional.tests rename to test/shape/data/in-house/tests/none-directional.tests diff --git a/test/shaping/data/in-house/tests/positioning-features.tests b/test/shape/data/in-house/tests/positioning-features.tests similarity index 100% rename from test/shaping/data/in-house/tests/positioning-features.tests rename to test/shape/data/in-house/tests/positioning-features.tests diff --git a/test/shaping/data/in-house/tests/rand.tests b/test/shape/data/in-house/tests/rand.tests similarity index 100% rename from test/shaping/data/in-house/tests/rand.tests rename to test/shape/data/in-house/tests/rand.tests diff --git a/test/shaping/data/in-house/tests/reverse-sub.tests b/test/shape/data/in-house/tests/reverse-sub.tests similarity index 100% rename from test/shaping/data/in-house/tests/reverse-sub.tests rename to test/shape/data/in-house/tests/reverse-sub.tests diff --git a/test/shaping/data/in-house/tests/rotation.tests b/test/shape/data/in-house/tests/rotation.tests similarity index 100% rename from test/shaping/data/in-house/tests/rotation.tests rename to test/shape/data/in-house/tests/rotation.tests diff --git a/test/shaping/data/in-house/tests/simple.tests b/test/shape/data/in-house/tests/simple.tests similarity index 100% rename from test/shaping/data/in-house/tests/simple.tests rename to test/shape/data/in-house/tests/simple.tests diff --git a/test/shaping/data/in-house/tests/sinhala.tests b/test/shape/data/in-house/tests/sinhala.tests similarity index 100% rename from test/shaping/data/in-house/tests/sinhala.tests rename to test/shape/data/in-house/tests/sinhala.tests diff --git a/test/shaping/data/in-house/tests/spaces.tests b/test/shape/data/in-house/tests/spaces.tests similarity index 100% rename from test/shaping/data/in-house/tests/spaces.tests rename to test/shape/data/in-house/tests/spaces.tests diff --git a/test/shaping/data/in-house/tests/tibetan-contractions-1.tests b/test/shape/data/in-house/tests/tibetan-contractions-1.tests similarity index 100% rename from test/shaping/data/in-house/tests/tibetan-contractions-1.tests rename to test/shape/data/in-house/tests/tibetan-contractions-1.tests diff --git a/test/shaping/data/in-house/tests/tibetan-contractions-2.tests b/test/shape/data/in-house/tests/tibetan-contractions-2.tests similarity index 100% rename from test/shaping/data/in-house/tests/tibetan-contractions-2.tests rename to test/shape/data/in-house/tests/tibetan-contractions-2.tests diff --git a/test/shaping/data/in-house/tests/tibetan-vowels.tests b/test/shape/data/in-house/tests/tibetan-vowels.tests similarity index 100% rename from test/shaping/data/in-house/tests/tibetan-vowels.tests rename to test/shape/data/in-house/tests/tibetan-vowels.tests diff --git a/test/shaping/data/in-house/tests/tt-kern-gpos.tests b/test/shape/data/in-house/tests/tt-kern-gpos.tests similarity index 100% rename from test/shaping/data/in-house/tests/tt-kern-gpos.tests rename to test/shape/data/in-house/tests/tt-kern-gpos.tests diff --git a/test/shaping/data/in-house/tests/use-indic3.tests b/test/shape/data/in-house/tests/use-indic3.tests similarity index 100% rename from test/shaping/data/in-house/tests/use-indic3.tests rename to test/shape/data/in-house/tests/use-indic3.tests diff --git a/test/shaping/data/in-house/tests/use-marchen.tests b/test/shape/data/in-house/tests/use-marchen.tests similarity index 100% rename from test/shaping/data/in-house/tests/use-marchen.tests rename to test/shape/data/in-house/tests/use-marchen.tests diff --git a/test/shaping/data/in-house/tests/use-syllable.tests b/test/shape/data/in-house/tests/use-syllable.tests similarity index 100% rename from test/shaping/data/in-house/tests/use-syllable.tests rename to test/shape/data/in-house/tests/use-syllable.tests diff --git a/test/shaping/data/in-house/tests/use-vowel-letter-spoofing.tests b/test/shape/data/in-house/tests/use-vowel-letter-spoofing.tests similarity index 100% rename from test/shaping/data/in-house/tests/use-vowel-letter-spoofing.tests rename to test/shape/data/in-house/tests/use-vowel-letter-spoofing.tests diff --git a/test/shaping/data/in-house/tests/use.tests b/test/shape/data/in-house/tests/use.tests similarity index 100% rename from test/shaping/data/in-house/tests/use.tests rename to test/shape/data/in-house/tests/use.tests diff --git a/test/shaping/data/in-house/tests/variations-rvrn.tests b/test/shape/data/in-house/tests/variations-rvrn.tests similarity index 100% rename from test/shaping/data/in-house/tests/variations-rvrn.tests rename to test/shape/data/in-house/tests/variations-rvrn.tests diff --git a/test/shaping/data/in-house/tests/variations.tests b/test/shape/data/in-house/tests/variations.tests similarity index 100% rename from test/shaping/data/in-house/tests/variations.tests rename to test/shape/data/in-house/tests/variations.tests diff --git a/test/shaping/data/in-house/tests/vertical.tests b/test/shape/data/in-house/tests/vertical.tests similarity index 100% rename from test/shaping/data/in-house/tests/vertical.tests rename to test/shape/data/in-house/tests/vertical.tests diff --git a/test/shaping/data/in-house/tests/zero-width-marks.tests b/test/shape/data/in-house/tests/zero-width-marks.tests similarity index 100% rename from test/shaping/data/in-house/tests/zero-width-marks.tests rename to test/shape/data/in-house/tests/zero-width-marks.tests diff --git a/test/shaping/data/text-rendering-tests/COPYING b/test/shape/data/text-rendering-tests/COPYING similarity index 100% rename from test/shaping/data/text-rendering-tests/COPYING rename to test/shape/data/text-rendering-tests/COPYING diff --git a/test/shaping/data/text-rendering-tests/DISABLED b/test/shape/data/text-rendering-tests/DISABLED similarity index 100% rename from test/shaping/data/text-rendering-tests/DISABLED rename to test/shape/data/text-rendering-tests/DISABLED diff --git a/test/shaping/data/text-rendering-tests/Makefile.am b/test/shape/data/text-rendering-tests/Makefile.am similarity index 100% rename from test/shaping/data/text-rendering-tests/Makefile.am rename to test/shape/data/text-rendering-tests/Makefile.am diff --git a/test/shaping/data/text-rendering-tests/Makefile.sources b/test/shape/data/text-rendering-tests/Makefile.sources similarity index 100% rename from test/shaping/data/text-rendering-tests/Makefile.sources rename to test/shape/data/text-rendering-tests/Makefile.sources diff --git a/test/shaping/data/text-rendering-tests/README b/test/shape/data/text-rendering-tests/README similarity index 100% rename from test/shaping/data/text-rendering-tests/README rename to test/shape/data/text-rendering-tests/README diff --git a/test/shaping/data/text-rendering-tests/fonts/AdobeVFPrototype-Subset.otf b/test/shape/data/text-rendering-tests/fonts/AdobeVFPrototype-Subset.otf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/AdobeVFPrototype-Subset.otf rename to test/shape/data/text-rendering-tests/fonts/AdobeVFPrototype-Subset.otf diff --git a/test/shaping/data/text-rendering-tests/fonts/FDArrayTest257.otf b/test/shape/data/text-rendering-tests/fonts/FDArrayTest257.otf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/FDArrayTest257.otf rename to test/shape/data/text-rendering-tests/fonts/FDArrayTest257.otf diff --git a/test/shaping/data/text-rendering-tests/fonts/FDArrayTest65535.otf b/test/shape/data/text-rendering-tests/fonts/FDArrayTest65535.otf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/FDArrayTest65535.otf rename to test/shape/data/text-rendering-tests/fonts/FDArrayTest65535.otf diff --git a/test/shaping/data/text-rendering-tests/fonts/NotoSansBalinese-Regular.ttf b/test/shape/data/text-rendering-tests/fonts/NotoSansBalinese-Regular.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/NotoSansBalinese-Regular.ttf rename to test/shape/data/text-rendering-tests/fonts/NotoSansBalinese-Regular.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/NotoSansKannada-Regular.ttf b/test/shape/data/text-rendering-tests/fonts/NotoSansKannada-Regular.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/NotoSansKannada-Regular.ttf rename to test/shape/data/text-rendering-tests/fonts/NotoSansKannada-Regular.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/NotoSerifKannada-Regular.ttf b/test/shape/data/text-rendering-tests/fonts/NotoSerifKannada-Regular.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/NotoSerifKannada-Regular.ttf rename to test/shape/data/text-rendering-tests/fonts/NotoSerifKannada-Regular.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/Selawik-README.md b/test/shape/data/text-rendering-tests/fonts/Selawik-README.md similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/Selawik-README.md rename to test/shape/data/text-rendering-tests/fonts/Selawik-README.md diff --git a/test/shaping/data/text-rendering-tests/fonts/Selawik-variable.ttf b/test/shape/data/text-rendering-tests/fonts/Selawik-variable.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/Selawik-variable.ttf rename to test/shape/data/text-rendering-tests/fonts/Selawik-variable.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestAVAR.ttf b/test/shape/data/text-rendering-tests/fonts/TestAVAR.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestAVAR.ttf rename to test/shape/data/text-rendering-tests/fonts/TestAVAR.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestCMAP14.otf b/test/shape/data/text-rendering-tests/fonts/TestCMAP14.otf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestCMAP14.otf rename to test/shape/data/text-rendering-tests/fonts/TestCMAP14.otf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestCMAPMacTurkish.ttf b/test/shape/data/text-rendering-tests/fonts/TestCMAPMacTurkish.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestCMAPMacTurkish.ttf rename to test/shape/data/text-rendering-tests/fonts/TestCMAPMacTurkish.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestCVARGVAROne.ttf b/test/shape/data/text-rendering-tests/fonts/TestCVARGVAROne.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestCVARGVAROne.ttf rename to test/shape/data/text-rendering-tests/fonts/TestCVARGVAROne.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestCVARGVARTwo.ttf b/test/shape/data/text-rendering-tests/fonts/TestCVARGVARTwo.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestCVARGVARTwo.ttf rename to test/shape/data/text-rendering-tests/fonts/TestCVARGVARTwo.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGLYFOne.ttf b/test/shape/data/text-rendering-tests/fonts/TestGLYFOne.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestGLYFOne.ttf rename to test/shape/data/text-rendering-tests/fonts/TestGLYFOne.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGPOSFour.ttf b/test/shape/data/text-rendering-tests/fonts/TestGPOSFour.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestGPOSFour.ttf rename to test/shape/data/text-rendering-tests/fonts/TestGPOSFour.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGPOSOne.ttf b/test/shape/data/text-rendering-tests/fonts/TestGPOSOne.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestGPOSOne.ttf rename to test/shape/data/text-rendering-tests/fonts/TestGPOSOne.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGPOSThree.ttf b/test/shape/data/text-rendering-tests/fonts/TestGPOSThree.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestGPOSThree.ttf rename to test/shape/data/text-rendering-tests/fonts/TestGPOSThree.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGPOSTwo.otf b/test/shape/data/text-rendering-tests/fonts/TestGPOSTwo.otf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestGPOSTwo.otf rename to test/shape/data/text-rendering-tests/fonts/TestGPOSTwo.otf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGSUBOne.otf b/test/shape/data/text-rendering-tests/fonts/TestGSUBOne.otf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestGSUBOne.otf rename to test/shape/data/text-rendering-tests/fonts/TestGSUBOne.otf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGSUBThree.ttf b/test/shape/data/text-rendering-tests/fonts/TestGSUBThree.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestGSUBThree.ttf rename to test/shape/data/text-rendering-tests/fonts/TestGSUBThree.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGVAR-Composite-0.ttf b/test/shape/data/text-rendering-tests/fonts/TestGVAR-Composite-0.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestGVAR-Composite-0.ttf rename to test/shape/data/text-rendering-tests/fonts/TestGVAR-Composite-0.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGVAR-Composite-Missing.ttf b/test/shape/data/text-rendering-tests/fonts/TestGVAR-Composite-Missing.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestGVAR-Composite-Missing.ttf rename to test/shape/data/text-rendering-tests/fonts/TestGVAR-Composite-Missing.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGVAREight.ttf b/test/shape/data/text-rendering-tests/fonts/TestGVAREight.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestGVAREight.ttf rename to test/shape/data/text-rendering-tests/fonts/TestGVAREight.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGVARFour.ttf b/test/shape/data/text-rendering-tests/fonts/TestGVARFour.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestGVARFour.ttf rename to test/shape/data/text-rendering-tests/fonts/TestGVARFour.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGVARNine.ttf b/test/shape/data/text-rendering-tests/fonts/TestGVARNine.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestGVARNine.ttf rename to test/shape/data/text-rendering-tests/fonts/TestGVARNine.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGVAROne.ttf b/test/shape/data/text-rendering-tests/fonts/TestGVAROne.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestGVAROne.ttf rename to test/shape/data/text-rendering-tests/fonts/TestGVAROne.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGVARThree.ttf b/test/shape/data/text-rendering-tests/fonts/TestGVARThree.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestGVARThree.ttf rename to test/shape/data/text-rendering-tests/fonts/TestGVARThree.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGVARTwo.ttf b/test/shape/data/text-rendering-tests/fonts/TestGVARTwo.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestGVARTwo.ttf rename to test/shape/data/text-rendering-tests/fonts/TestGVARTwo.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestHVAROne.otf b/test/shape/data/text-rendering-tests/fonts/TestHVAROne.otf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestHVAROne.otf rename to test/shape/data/text-rendering-tests/fonts/TestHVAROne.otf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestHVARTwo.ttf b/test/shape/data/text-rendering-tests/fonts/TestHVARTwo.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestHVARTwo.ttf rename to test/shape/data/text-rendering-tests/fonts/TestHVARTwo.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestKERNOne.otf b/test/shape/data/text-rendering-tests/fonts/TestKERNOne.otf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestKERNOne.otf rename to test/shape/data/text-rendering-tests/fonts/TestKERNOne.otf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXEight.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXEight.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXEight.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXEight.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXEighteen.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXEighteen.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXEighteen.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXEighteen.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXEleven.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXEleven.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXEleven.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXEleven.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXForty.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXForty.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXForty.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXForty.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXFour.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXFour.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXFour.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXFour.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXFourteen.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXFourteen.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXFourteen.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXFourteen.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXFourtyone.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXFourtyone.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXFourtyone.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXFourtyone.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXNine.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXNine.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXNine.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXNine.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXOne.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXOne.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXOne.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXOne.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXSeventeen.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXSeventeen.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXSeventeen.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXSeventeen.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXSixteen.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXSixteen.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXSixteen.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXSixteen.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTen.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXTen.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTen.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXTen.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXThirteen.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXThirteen.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXThirteen.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXThirteen.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXThirtyeight.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXThirtyeight.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXThirtyeight.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXThirtyeight.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXThirtyfive.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXThirtyfive.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXThirtyfive.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXThirtyfive.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXThirtyfour.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXThirtyfour.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXThirtyfour.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXThirtyfour.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXThirtynine.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXThirtynine.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXThirtynine.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXThirtynine.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXThirtyone.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXThirtyone.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXThirtyone.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXThirtyone.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXThirtyseven.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXThirtyseven.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXThirtyseven.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXThirtyseven.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXThirtysix.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXThirtysix.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXThirtysix.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXThirtysix.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXThirtythree.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXThirtythree.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXThirtythree.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXThirtythree.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXThirtytwo.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXThirtytwo.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXThirtytwo.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXThirtytwo.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXThree.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXThree.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXThree.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXThree.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwelve.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXTwelve.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwelve.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXTwelve.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwenty.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXTwenty.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwenty.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXTwenty.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyeight.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXTwentyeight.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyeight.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXTwentyeight.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyfive.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXTwentyfive.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyfive.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXTwentyfive.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyfour.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXTwentyfour.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyfour.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXTwentyfour.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentynine.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXTwentynine.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwentynine.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXTwentynine.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyone.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXTwentyone.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyone.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXTwentyone.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyseven.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXTwentyseven.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyseven.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXTwentyseven.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentysix.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXTwentysix.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwentysix.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXTwentysix.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentythree.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXTwentythree.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwentythree.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXTwentythree.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentytwo.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXTwentytwo.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwentytwo.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXTwentytwo.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwo.ttf b/test/shape/data/text-rendering-tests/fonts/TestMORXTwo.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwo.ttf rename to test/shape/data/text-rendering-tests/fonts/TestMORXTwo.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestSFNTOne.otf b/test/shape/data/text-rendering-tests/fonts/TestSFNTOne.otf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestSFNTOne.otf rename to test/shape/data/text-rendering-tests/fonts/TestSFNTOne.otf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestSFNTTwo.ttf b/test/shape/data/text-rendering-tests/fonts/TestSFNTTwo.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestSFNTTwo.ttf rename to test/shape/data/text-rendering-tests/fonts/TestSFNTTwo.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestSVGgradientTransform.otf b/test/shape/data/text-rendering-tests/fonts/TestSVGgradientTransform.otf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestSVGgradientTransform.otf rename to test/shape/data/text-rendering-tests/fonts/TestSVGgradientTransform.otf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestSVGgzip.otf b/test/shape/data/text-rendering-tests/fonts/TestSVGgzip.otf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestSVGgzip.otf rename to test/shape/data/text-rendering-tests/fonts/TestSVGgzip.otf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestSVGmultiGlyphs.otf b/test/shape/data/text-rendering-tests/fonts/TestSVGmultiGlyphs.otf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestSVGmultiGlyphs.otf rename to test/shape/data/text-rendering-tests/fonts/TestSVGmultiGlyphs.otf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestShapeAran.ttf b/test/shape/data/text-rendering-tests/fonts/TestShapeAran.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestShapeAran.ttf rename to test/shape/data/text-rendering-tests/fonts/TestShapeAran.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestShapeEthi.ttf b/test/shape/data/text-rendering-tests/fonts/TestShapeEthi.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestShapeEthi.ttf rename to test/shape/data/text-rendering-tests/fonts/TestShapeEthi.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestShapeKndaV3.ttf b/test/shape/data/text-rendering-tests/fonts/TestShapeKndaV3.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestShapeKndaV3.ttf rename to test/shape/data/text-rendering-tests/fonts/TestShapeKndaV3.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestShapeLana.ttf b/test/shape/data/text-rendering-tests/fonts/TestShapeLana.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestShapeLana.ttf rename to test/shape/data/text-rendering-tests/fonts/TestShapeLana.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/TestTRAKOne.ttf b/test/shape/data/text-rendering-tests/fonts/TestTRAKOne.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/TestTRAKOne.ttf rename to test/shape/data/text-rendering-tests/fonts/TestTRAKOne.ttf diff --git a/test/shaping/data/text-rendering-tests/fonts/Zycon.ttf b/test/shape/data/text-rendering-tests/fonts/Zycon.ttf similarity index 100% rename from test/shaping/data/text-rendering-tests/fonts/Zycon.ttf rename to test/shape/data/text-rendering-tests/fonts/Zycon.ttf diff --git a/test/shaping/data/text-rendering-tests/meson.build b/test/shape/data/text-rendering-tests/meson.build similarity index 100% rename from test/shaping/data/text-rendering-tests/meson.build rename to test/shape/data/text-rendering-tests/meson.build diff --git a/test/shaping/data/text-rendering-tests/tests/AVAR-1.tests b/test/shape/data/text-rendering-tests/tests/AVAR-1.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/AVAR-1.tests rename to test/shape/data/text-rendering-tests/tests/AVAR-1.tests diff --git a/test/shaping/data/text-rendering-tests/tests/CFF-1.tests b/test/shape/data/text-rendering-tests/tests/CFF-1.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/CFF-1.tests rename to test/shape/data/text-rendering-tests/tests/CFF-1.tests diff --git a/test/shaping/data/text-rendering-tests/tests/CFF-2.tests b/test/shape/data/text-rendering-tests/tests/CFF-2.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/CFF-2.tests rename to test/shape/data/text-rendering-tests/tests/CFF-2.tests diff --git a/test/shaping/data/text-rendering-tests/tests/CFF2-1.tests b/test/shape/data/text-rendering-tests/tests/CFF2-1.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/CFF2-1.tests rename to test/shape/data/text-rendering-tests/tests/CFF2-1.tests diff --git a/test/shaping/data/text-rendering-tests/tests/CMAP-1.tests b/test/shape/data/text-rendering-tests/tests/CMAP-1.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/CMAP-1.tests rename to test/shape/data/text-rendering-tests/tests/CMAP-1.tests diff --git a/test/shaping/data/text-rendering-tests/tests/CMAP-2.tests b/test/shape/data/text-rendering-tests/tests/CMAP-2.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/CMAP-2.tests rename to test/shape/data/text-rendering-tests/tests/CMAP-2.tests diff --git a/test/shaping/data/text-rendering-tests/tests/CMAP-3.tests b/test/shape/data/text-rendering-tests/tests/CMAP-3.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/CMAP-3.tests rename to test/shape/data/text-rendering-tests/tests/CMAP-3.tests diff --git a/test/shaping/data/text-rendering-tests/tests/CVAR-1.tests b/test/shape/data/text-rendering-tests/tests/CVAR-1.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/CVAR-1.tests rename to test/shape/data/text-rendering-tests/tests/CVAR-1.tests diff --git a/test/shaping/data/text-rendering-tests/tests/CVAR-2.tests b/test/shape/data/text-rendering-tests/tests/CVAR-2.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/CVAR-2.tests rename to test/shape/data/text-rendering-tests/tests/CVAR-2.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GLYF-1.tests b/test/shape/data/text-rendering-tests/tests/GLYF-1.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GLYF-1.tests rename to test/shape/data/text-rendering-tests/tests/GLYF-1.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GPOS-1.tests b/test/shape/data/text-rendering-tests/tests/GPOS-1.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GPOS-1.tests rename to test/shape/data/text-rendering-tests/tests/GPOS-1.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GPOS-2.tests b/test/shape/data/text-rendering-tests/tests/GPOS-2.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GPOS-2.tests rename to test/shape/data/text-rendering-tests/tests/GPOS-2.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GPOS-3.tests b/test/shape/data/text-rendering-tests/tests/GPOS-3.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GPOS-3.tests rename to test/shape/data/text-rendering-tests/tests/GPOS-3.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GPOS-4.tests b/test/shape/data/text-rendering-tests/tests/GPOS-4.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GPOS-4.tests rename to test/shape/data/text-rendering-tests/tests/GPOS-4.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GPOS-5.tests b/test/shape/data/text-rendering-tests/tests/GPOS-5.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GPOS-5.tests rename to test/shape/data/text-rendering-tests/tests/GPOS-5.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GSUB-1.tests b/test/shape/data/text-rendering-tests/tests/GSUB-1.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GSUB-1.tests rename to test/shape/data/text-rendering-tests/tests/GSUB-1.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GSUB-2.tests b/test/shape/data/text-rendering-tests/tests/GSUB-2.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GSUB-2.tests rename to test/shape/data/text-rendering-tests/tests/GSUB-2.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GSUB-3.tests b/test/shape/data/text-rendering-tests/tests/GSUB-3.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GSUB-3.tests rename to test/shape/data/text-rendering-tests/tests/GSUB-3.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-1.tests b/test/shape/data/text-rendering-tests/tests/GVAR-1.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GVAR-1.tests rename to test/shape/data/text-rendering-tests/tests/GVAR-1.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-2.tests b/test/shape/data/text-rendering-tests/tests/GVAR-2.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GVAR-2.tests rename to test/shape/data/text-rendering-tests/tests/GVAR-2.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-3.tests b/test/shape/data/text-rendering-tests/tests/GVAR-3.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GVAR-3.tests rename to test/shape/data/text-rendering-tests/tests/GVAR-3.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-4.tests b/test/shape/data/text-rendering-tests/tests/GVAR-4.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GVAR-4.tests rename to test/shape/data/text-rendering-tests/tests/GVAR-4.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-5.tests b/test/shape/data/text-rendering-tests/tests/GVAR-5.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GVAR-5.tests rename to test/shape/data/text-rendering-tests/tests/GVAR-5.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-6.tests b/test/shape/data/text-rendering-tests/tests/GVAR-6.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GVAR-6.tests rename to test/shape/data/text-rendering-tests/tests/GVAR-6.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-7.tests b/test/shape/data/text-rendering-tests/tests/GVAR-7.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GVAR-7.tests rename to test/shape/data/text-rendering-tests/tests/GVAR-7.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-8.tests b/test/shape/data/text-rendering-tests/tests/GVAR-8.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GVAR-8.tests rename to test/shape/data/text-rendering-tests/tests/GVAR-8.tests diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-9.tests b/test/shape/data/text-rendering-tests/tests/GVAR-9.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/GVAR-9.tests rename to test/shape/data/text-rendering-tests/tests/GVAR-9.tests diff --git a/test/shaping/data/text-rendering-tests/tests/HVAR-1.tests b/test/shape/data/text-rendering-tests/tests/HVAR-1.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/HVAR-1.tests rename to test/shape/data/text-rendering-tests/tests/HVAR-1.tests diff --git a/test/shaping/data/text-rendering-tests/tests/HVAR-2.tests b/test/shape/data/text-rendering-tests/tests/HVAR-2.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/HVAR-2.tests rename to test/shape/data/text-rendering-tests/tests/HVAR-2.tests diff --git a/test/shaping/data/text-rendering-tests/tests/KERN-1.tests b/test/shape/data/text-rendering-tests/tests/KERN-1.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/KERN-1.tests rename to test/shape/data/text-rendering-tests/tests/KERN-1.tests diff --git a/test/shaping/data/text-rendering-tests/tests/KERN-2.tests b/test/shape/data/text-rendering-tests/tests/KERN-2.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/KERN-2.tests rename to test/shape/data/text-rendering-tests/tests/KERN-2.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-1.tests b/test/shape/data/text-rendering-tests/tests/MORX-1.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-1.tests rename to test/shape/data/text-rendering-tests/tests/MORX-1.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-10.tests b/test/shape/data/text-rendering-tests/tests/MORX-10.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-10.tests rename to test/shape/data/text-rendering-tests/tests/MORX-10.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-11.tests b/test/shape/data/text-rendering-tests/tests/MORX-11.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-11.tests rename to test/shape/data/text-rendering-tests/tests/MORX-11.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-12.tests b/test/shape/data/text-rendering-tests/tests/MORX-12.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-12.tests rename to test/shape/data/text-rendering-tests/tests/MORX-12.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-13.tests b/test/shape/data/text-rendering-tests/tests/MORX-13.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-13.tests rename to test/shape/data/text-rendering-tests/tests/MORX-13.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-14.tests b/test/shape/data/text-rendering-tests/tests/MORX-14.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-14.tests rename to test/shape/data/text-rendering-tests/tests/MORX-14.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-16.tests b/test/shape/data/text-rendering-tests/tests/MORX-16.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-16.tests rename to test/shape/data/text-rendering-tests/tests/MORX-16.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-17.tests b/test/shape/data/text-rendering-tests/tests/MORX-17.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-17.tests rename to test/shape/data/text-rendering-tests/tests/MORX-17.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-18.tests b/test/shape/data/text-rendering-tests/tests/MORX-18.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-18.tests rename to test/shape/data/text-rendering-tests/tests/MORX-18.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-19.tests b/test/shape/data/text-rendering-tests/tests/MORX-19.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-19.tests rename to test/shape/data/text-rendering-tests/tests/MORX-19.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-2.tests b/test/shape/data/text-rendering-tests/tests/MORX-2.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-2.tests rename to test/shape/data/text-rendering-tests/tests/MORX-2.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-20.tests b/test/shape/data/text-rendering-tests/tests/MORX-20.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-20.tests rename to test/shape/data/text-rendering-tests/tests/MORX-20.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-21.tests b/test/shape/data/text-rendering-tests/tests/MORX-21.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-21.tests rename to test/shape/data/text-rendering-tests/tests/MORX-21.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-22.tests b/test/shape/data/text-rendering-tests/tests/MORX-22.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-22.tests rename to test/shape/data/text-rendering-tests/tests/MORX-22.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-23.tests b/test/shape/data/text-rendering-tests/tests/MORX-23.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-23.tests rename to test/shape/data/text-rendering-tests/tests/MORX-23.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-24.tests b/test/shape/data/text-rendering-tests/tests/MORX-24.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-24.tests rename to test/shape/data/text-rendering-tests/tests/MORX-24.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-25.tests b/test/shape/data/text-rendering-tests/tests/MORX-25.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-25.tests rename to test/shape/data/text-rendering-tests/tests/MORX-25.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-26.tests b/test/shape/data/text-rendering-tests/tests/MORX-26.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-26.tests rename to test/shape/data/text-rendering-tests/tests/MORX-26.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-27.tests b/test/shape/data/text-rendering-tests/tests/MORX-27.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-27.tests rename to test/shape/data/text-rendering-tests/tests/MORX-27.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-28.tests b/test/shape/data/text-rendering-tests/tests/MORX-28.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-28.tests rename to test/shape/data/text-rendering-tests/tests/MORX-28.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-29.tests b/test/shape/data/text-rendering-tests/tests/MORX-29.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-29.tests rename to test/shape/data/text-rendering-tests/tests/MORX-29.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-3.tests b/test/shape/data/text-rendering-tests/tests/MORX-3.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-3.tests rename to test/shape/data/text-rendering-tests/tests/MORX-3.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-30.tests b/test/shape/data/text-rendering-tests/tests/MORX-30.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-30.tests rename to test/shape/data/text-rendering-tests/tests/MORX-30.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-31.tests b/test/shape/data/text-rendering-tests/tests/MORX-31.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-31.tests rename to test/shape/data/text-rendering-tests/tests/MORX-31.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-32.tests b/test/shape/data/text-rendering-tests/tests/MORX-32.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-32.tests rename to test/shape/data/text-rendering-tests/tests/MORX-32.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-33.tests b/test/shape/data/text-rendering-tests/tests/MORX-33.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-33.tests rename to test/shape/data/text-rendering-tests/tests/MORX-33.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-34.tests b/test/shape/data/text-rendering-tests/tests/MORX-34.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-34.tests rename to test/shape/data/text-rendering-tests/tests/MORX-34.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-35.tests b/test/shape/data/text-rendering-tests/tests/MORX-35.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-35.tests rename to test/shape/data/text-rendering-tests/tests/MORX-35.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-36.tests b/test/shape/data/text-rendering-tests/tests/MORX-36.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-36.tests rename to test/shape/data/text-rendering-tests/tests/MORX-36.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-37.tests b/test/shape/data/text-rendering-tests/tests/MORX-37.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-37.tests rename to test/shape/data/text-rendering-tests/tests/MORX-37.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-38.tests b/test/shape/data/text-rendering-tests/tests/MORX-38.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-38.tests rename to test/shape/data/text-rendering-tests/tests/MORX-38.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-39.tests b/test/shape/data/text-rendering-tests/tests/MORX-39.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-39.tests rename to test/shape/data/text-rendering-tests/tests/MORX-39.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-4.tests b/test/shape/data/text-rendering-tests/tests/MORX-4.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-4.tests rename to test/shape/data/text-rendering-tests/tests/MORX-4.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-40.tests b/test/shape/data/text-rendering-tests/tests/MORX-40.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-40.tests rename to test/shape/data/text-rendering-tests/tests/MORX-40.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-41.tests b/test/shape/data/text-rendering-tests/tests/MORX-41.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-41.tests rename to test/shape/data/text-rendering-tests/tests/MORX-41.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-5.tests b/test/shape/data/text-rendering-tests/tests/MORX-5.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-5.tests rename to test/shape/data/text-rendering-tests/tests/MORX-5.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-6.tests b/test/shape/data/text-rendering-tests/tests/MORX-6.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-6.tests rename to test/shape/data/text-rendering-tests/tests/MORX-6.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-7.tests b/test/shape/data/text-rendering-tests/tests/MORX-7.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-7.tests rename to test/shape/data/text-rendering-tests/tests/MORX-7.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-8.tests b/test/shape/data/text-rendering-tests/tests/MORX-8.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-8.tests rename to test/shape/data/text-rendering-tests/tests/MORX-8.tests diff --git a/test/shaping/data/text-rendering-tests/tests/MORX-9.tests b/test/shape/data/text-rendering-tests/tests/MORX-9.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/MORX-9.tests rename to test/shape/data/text-rendering-tests/tests/MORX-9.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SFNT-1.tests b/test/shape/data/text-rendering-tests/tests/SFNT-1.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SFNT-1.tests rename to test/shape/data/text-rendering-tests/tests/SFNT-1.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SFNT-2.tests b/test/shape/data/text-rendering-tests/tests/SFNT-2.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SFNT-2.tests rename to test/shape/data/text-rendering-tests/tests/SFNT-2.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SHARAN-1.tests b/test/shape/data/text-rendering-tests/tests/SHARAN-1.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SHARAN-1.tests rename to test/shape/data/text-rendering-tests/tests/SHARAN-1.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SHBALI-1.tests b/test/shape/data/text-rendering-tests/tests/SHBALI-1.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SHBALI-1.tests rename to test/shape/data/text-rendering-tests/tests/SHBALI-1.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SHBALI-2.tests b/test/shape/data/text-rendering-tests/tests/SHBALI-2.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SHBALI-2.tests rename to test/shape/data/text-rendering-tests/tests/SHBALI-2.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SHBALI-3.tests b/test/shape/data/text-rendering-tests/tests/SHBALI-3.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SHBALI-3.tests rename to test/shape/data/text-rendering-tests/tests/SHBALI-3.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SHKNDA-1.tests b/test/shape/data/text-rendering-tests/tests/SHKNDA-1.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SHKNDA-1.tests rename to test/shape/data/text-rendering-tests/tests/SHKNDA-1.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SHKNDA-2.tests b/test/shape/data/text-rendering-tests/tests/SHKNDA-2.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SHKNDA-2.tests rename to test/shape/data/text-rendering-tests/tests/SHKNDA-2.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SHKNDA-3.tests b/test/shape/data/text-rendering-tests/tests/SHKNDA-3.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SHKNDA-3.tests rename to test/shape/data/text-rendering-tests/tests/SHKNDA-3.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SHLANA-1.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-1.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SHLANA-1.tests rename to test/shape/data/text-rendering-tests/tests/SHLANA-1.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SHLANA-10.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-10.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SHLANA-10.tests rename to test/shape/data/text-rendering-tests/tests/SHLANA-10.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SHLANA-2.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-2.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SHLANA-2.tests rename to test/shape/data/text-rendering-tests/tests/SHLANA-2.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SHLANA-3.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-3.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SHLANA-3.tests rename to test/shape/data/text-rendering-tests/tests/SHLANA-3.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SHLANA-4.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-4.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SHLANA-4.tests rename to test/shape/data/text-rendering-tests/tests/SHLANA-4.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SHLANA-5.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-5.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SHLANA-5.tests rename to test/shape/data/text-rendering-tests/tests/SHLANA-5.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SHLANA-6.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-6.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SHLANA-6.tests rename to test/shape/data/text-rendering-tests/tests/SHLANA-6.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SHLANA-7.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-7.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SHLANA-7.tests rename to test/shape/data/text-rendering-tests/tests/SHLANA-7.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SHLANA-8.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-8.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SHLANA-8.tests rename to test/shape/data/text-rendering-tests/tests/SHLANA-8.tests diff --git a/test/shaping/data/text-rendering-tests/tests/SHLANA-9.tests b/test/shape/data/text-rendering-tests/tests/SHLANA-9.tests similarity index 100% rename from test/shaping/data/text-rendering-tests/tests/SHLANA-9.tests rename to test/shape/data/text-rendering-tests/tests/SHLANA-9.tests diff --git a/test/shaping/data/text-rendering-tests/update.py b/test/shape/data/text-rendering-tests/update.py similarity index 100% rename from test/shaping/data/text-rendering-tests/update.py rename to test/shape/data/text-rendering-tests/update.py diff --git a/test/shaping/hb-diff b/test/shape/hb-diff similarity index 100% rename from test/shaping/hb-diff rename to test/shape/hb-diff diff --git a/test/shaping/hb-diff-colorize b/test/shape/hb-diff-colorize similarity index 100% rename from test/shaping/hb-diff-colorize rename to test/shape/hb-diff-colorize diff --git a/test/shaping/hb-diff-filter-failures b/test/shape/hb-diff-filter-failures similarity index 100% rename from test/shaping/hb-diff-filter-failures rename to test/shape/hb-diff-filter-failures diff --git a/test/shaping/hb-diff-stat b/test/shape/hb-diff-stat similarity index 100% rename from test/shaping/hb-diff-stat rename to test/shape/hb-diff-stat diff --git a/test/shaping/hb-unicode-decode b/test/shape/hb-unicode-decode similarity index 100% rename from test/shaping/hb-unicode-decode rename to test/shape/hb-unicode-decode diff --git a/test/shaping/hb-unicode-encode b/test/shape/hb-unicode-encode similarity index 100% rename from test/shaping/hb-unicode-encode rename to test/shape/hb-unicode-encode diff --git a/test/shaping/hb-unicode-prettyname b/test/shape/hb-unicode-prettyname similarity index 100% rename from test/shaping/hb-unicode-prettyname rename to test/shape/hb-unicode-prettyname diff --git a/test/shaping/hb_test_tools.py b/test/shape/hb_test_tools.py similarity index 100% rename from test/shaping/hb_test_tools.py rename to test/shape/hb_test_tools.py diff --git a/test/shaping/meson.build b/test/shape/meson.build similarity index 100% rename from test/shaping/meson.build rename to test/shape/meson.build diff --git a/test/shaping/record-test.sh b/test/shape/record-test.sh similarity index 100% rename from test/shaping/record-test.sh rename to test/shape/record-test.sh diff --git a/test/shaping/run-tests.py b/test/shape/run-tests.py similarity index 100% rename from test/shaping/run-tests.py rename to test/shape/run-tests.py diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-persian/mehran.txt b/test/shape/texts/in-house/shaper-arabic/script-arabic/language-persian/mehran.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-persian/mehran.txt rename to test/shape/texts/in-house/shaper-arabic/script-arabic/language-persian/mehran.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/2grams.txt b/test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/2grams.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/2grams.txt rename to test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/2grams.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/3grams.txt b/test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/3grams.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/3grams.txt rename to test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/3grams.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/4grams.txt b/test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/4grams.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/4grams.txt rename to test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/4grams.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/5grams.txt b/test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/5grams.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/5grams.txt rename to test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/5grams.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/6grams.txt b/test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/6grams.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/6grams.txt rename to test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/6grams.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/7grams.txt b/test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/7grams.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/7grams.txt rename to test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/7grams.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/8grams.txt b/test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/8grams.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/8grams.txt rename to test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/8grams.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/LICENSE b/test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/LICENSE similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/LICENSE rename to test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/LICENSE diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/README b/test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/README similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/README rename to test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/README diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/SOURCES b/test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/SOURCES similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/SOURCES rename to test/shape/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/SOURCES diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/lam-alef.txt b/test/shape/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/lam-alef.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/lam-alef.txt rename to test/shape/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/lam-alef.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-arabic.txt b/test/shape/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-arabic.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-arabic.txt rename to test/shape/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-arabic.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-persian.txt b/test/shape/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-persian.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-persian.txt rename to test/shape/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-persian.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-urdu.txt b/test/shape/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-urdu.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-urdu.txt rename to test/shape/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-urdu.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/ligature-components.txt b/test/shape/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/ligature-components.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/ligature-components.txt rename to test/shape/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/ligature-components.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/ligature-diacritics.txt b/test/shape/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/ligature-diacritics.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/ligature-diacritics.txt rename to test/shape/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/ligature-diacritics.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/mark-skipping.txt b/test/shape/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/mark-skipping.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/mark-skipping.txt rename to test/shape/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/mark-skipping.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/misc.txt b/test/shape/texts/in-house/shaper-arabic/script-mongolian/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/misc.txt rename to test/shape/texts/in-house/shaper-arabic/script-mongolian/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/non-joining.txt b/test/shape/texts/in-house/shaper-arabic/script-mongolian/misc/non-joining.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/non-joining.txt rename to test/shape/texts/in-house/shaper-arabic/script-mongolian/misc/non-joining.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/poem.txt b/test/shape/texts/in-house/shaper-arabic/script-mongolian/misc/poem.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/poem.txt rename to test/shape/texts/in-house/shaper-arabic/script-mongolian/misc/poem.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/variation-selectors.txt b/test/shape/texts/in-house/shaper-arabic/script-mongolian/misc/variation-selectors.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/variation-selectors.txt rename to test/shape/texts/in-house/shaper-arabic/script-mongolian/misc/variation-selectors.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-nko/misc/misc.txt b/test/shape/texts/in-house/shaper-arabic/script-nko/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-nko/misc/misc.txt rename to test/shape/texts/in-house/shaper-arabic/script-nko/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-phags-pa/misc/misc.txt b/test/shape/texts/in-house/shaper-arabic/script-phags-pa/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-phags-pa/misc/misc.txt rename to test/shape/texts/in-house/shaper-arabic/script-phags-pa/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-syriac/misc/abbreviation-mark.txt b/test/shape/texts/in-house/shaper-arabic/script-syriac/misc/abbreviation-mark.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-syriac/misc/abbreviation-mark.txt rename to test/shape/texts/in-house/shaper-arabic/script-syriac/misc/abbreviation-mark.txt diff --git a/test/shaping/texts/in-house/shaper-arabic/script-syriac/misc/alaph.txt b/test/shape/texts/in-house/shaper-arabic/script-syriac/misc/alaph.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-arabic/script-syriac/misc/alaph.txt rename to test/shape/texts/in-house/shaper-arabic/script-syriac/misc/alaph.txt diff --git a/test/shaping/texts/in-house/shaper-default/script-ethiopic/misc/misc.txt b/test/shape/texts/in-house/shaper-default/script-ethiopic/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-default/script-ethiopic/misc/misc.txt rename to test/shape/texts/in-house/shaper-default/script-ethiopic/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-default/script-han/misc/cjk-compat.txt b/test/shape/texts/in-house/shaper-default/script-han/misc/cjk-compat.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-default/script-han/misc/cjk-compat.txt rename to test/shape/texts/in-house/shaper-default/script-han/misc/cjk-compat.txt diff --git a/test/shaping/texts/in-house/shaper-default/script-hiragana/misc/kazuraki-liga-lines.txt b/test/shape/texts/in-house/shaper-default/script-hiragana/misc/kazuraki-liga-lines.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-default/script-hiragana/misc/kazuraki-liga-lines.txt rename to test/shape/texts/in-house/shaper-default/script-hiragana/misc/kazuraki-liga-lines.txt diff --git a/test/shaping/texts/in-house/shaper-default/script-hiragana/misc/kazuraki-liga.txt b/test/shape/texts/in-house/shaper-default/script-hiragana/misc/kazuraki-liga.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-default/script-hiragana/misc/kazuraki-liga.txt rename to test/shape/texts/in-house/shaper-default/script-hiragana/misc/kazuraki-liga.txt diff --git a/test/shaping/texts/in-house/shaper-default/script-linear-b/misc/misc.txt b/test/shape/texts/in-house/shaper-default/script-linear-b/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-default/script-linear-b/misc/misc.txt rename to test/shape/texts/in-house/shaper-default/script-linear-b/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-default/script-tifinagh/misc/misc.txt b/test/shape/texts/in-house/shaper-default/script-tifinagh/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-default/script-tifinagh/misc/misc.txt rename to test/shape/texts/in-house/shaper-default/script-tifinagh/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-hangul/script-hangul/misc/misc.txt b/test/shape/texts/in-house/shaper-hangul/script-hangul/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-hangul/script-hangul/misc/misc.txt rename to test/shape/texts/in-house/shaper-hangul/script-hangul/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-hebrew/script-hebrew/misc/diacritics.txt b/test/shape/texts/in-house/shaper-hebrew/script-hebrew/misc/diacritics.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-hebrew/script-hebrew/misc/diacritics.txt rename to test/shape/texts/in-house/shaper-hebrew/script-hebrew/misc/diacritics.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/LICENSE b/test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/LICENSE similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/LICENSE rename to test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/LICENSE diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/README b/test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/README similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/README rename to test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/README diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/SOURCES b/test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/SOURCES similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/SOURCES rename to test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/SOURCES diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt b/test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt rename to test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt rename to test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt rename to test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt rename to test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt b/test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt rename to test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt b/test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt rename to test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gsub/IndicFontFeatureGSUB.txt b/test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/gsub/IndicFontFeatureGSUB.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gsub/IndicFontFeatureGSUB.txt rename to test/shape/texts/in-house/shaper-indic/script-assamese/utrrs/gsub/IndicFontFeatureGSUB.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/bengali-vowel-letters.txt b/test/shape/texts/in-house/shaper-indic/script-bengali/bengali-vowel-letters.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-bengali/bengali-vowel-letters.txt rename to test/shape/texts/in-house/shaper-indic/script-bengali/bengali-vowel-letters.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/misc/misc.txt b/test/shape/texts/in-house/shaper-indic/script-bengali/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-bengali/misc/misc.txt rename to test/shape/texts/in-house/shaper-indic/script-bengali/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/misc/reph.txt b/test/shape/texts/in-house/shaper-indic/script-bengali/misc/reph.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-bengali/misc/reph.txt rename to test/shape/texts/in-house/shaper-indic/script-bengali/misc/reph.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/LICENSE b/test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/LICENSE similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/LICENSE rename to test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/LICENSE diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/README b/test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/README similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/README rename to test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/README diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/SOURCES b/test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/SOURCES similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/SOURCES rename to test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/SOURCES diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt b/test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt rename to test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt rename to test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt rename to test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt rename to test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt b/test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt rename to test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt b/test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt rename to test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gsub/IndicFontFeatureGSUB.txt b/test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/gsub/IndicFontFeatureGSUB.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gsub/IndicFontFeatureGSUB.txt rename to test/shape/texts/in-house/shaper-indic/script-bengali/utrrs/gsub/IndicFontFeatureGSUB.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/devanagari-atomic-consonants.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/devanagari-atomic-consonants.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/devanagari-atomic-consonants.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/devanagari-atomic-consonants.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/devanagari-vowel-letters.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/devanagari-vowel-letters.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/devanagari-vowel-letters.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/devanagari-vowel-letters.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/dottedcircle.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/misc/dottedcircle.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/dottedcircle.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/misc/dottedcircle.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/eyelash.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/misc/eyelash.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/eyelash.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/misc/eyelash.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/joiners.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/misc/joiners.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/joiners.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/misc/joiners.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/misc.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/misc.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/spec-deviations.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/misc/spec-deviations.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/spec-deviations.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/misc/spec-deviations.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/tricky-reordering.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/misc/tricky-reordering.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/tricky-reordering.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/misc/tricky-reordering.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/LICENSE b/test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/LICENSE similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/LICENSE rename to test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/LICENSE diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/README b/test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/README similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/README rename to test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/README diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/SOURCES b/test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/SOURCES similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/SOURCES rename to test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/SOURCES diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DevnagariSpecificAddition.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DevnagariSpecificAddition.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DevnagariSpecificAddition.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DevnagariSpecificAddition.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-GenericPunctuation.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-GenericPunctuation.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-GenericPunctuation.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-GenericPunctuation.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gsub/IndicFontFeatureGSUB.txt b/test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/gsub/IndicFontFeatureGSUB.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gsub/IndicFontFeatureGSUB.txt rename to test/shape/texts/in-house/shaper-indic/script-devanagari/utrrs/gsub/IndicFontFeatureGSUB.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/gujarati-vowel-letters.txt b/test/shape/texts/in-house/shaper-indic/script-gujarati/gujarati-vowel-letters.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/gujarati-vowel-letters.txt rename to test/shape/texts/in-house/shaper-indic/script-gujarati/gujarati-vowel-letters.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/LICENSE b/test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/LICENSE similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/LICENSE rename to test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/LICENSE diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/README b/test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/README similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/README rename to test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/README diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/SOURCES b/test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/SOURCES similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/SOURCES rename to test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/SOURCES diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt b/test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt rename to test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt rename to test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt rename to test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt rename to test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt b/test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt rename to test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt b/test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt rename to test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gsub/IndicFontFeatureGSUB.txt b/test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/gsub/IndicFontFeatureGSUB.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gsub/IndicFontFeatureGSUB.txt rename to test/shape/texts/in-house/shaper-indic/script-gujarati/utrrs/gsub/IndicFontFeatureGSUB.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/gurmukhi-vowel-letters.txt b/test/shape/texts/in-house/shaper-indic/script-gurmukhi/gurmukhi-vowel-letters.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/gurmukhi-vowel-letters.txt rename to test/shape/texts/in-house/shaper-indic/script-gurmukhi/gurmukhi-vowel-letters.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/misc/misc.txt b/test/shape/texts/in-house/shaper-indic/script-gurmukhi/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/misc/misc.txt rename to test/shape/texts/in-house/shaper-indic/script-gurmukhi/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/LICENSE b/test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/LICENSE similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/LICENSE rename to test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/LICENSE diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/README b/test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/README similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/README rename to test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/README diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/SOURCES b/test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/SOURCES similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/SOURCES rename to test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/SOURCES diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt rename to test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt rename to test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-GurmukhiSpecific.txt b/test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-GurmukhiSpecific.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-GurmukhiSpecific.txt rename to test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-GurmukhiSpecific.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt rename to test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt rename to test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt b/test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt rename to test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt b/test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt rename to test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gsub/IndicFontFeatureGSUB.txt b/test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gsub/IndicFontFeatureGSUB.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gsub/IndicFontFeatureGSUB.txt rename to test/shape/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gsub/IndicFontFeatureGSUB.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/kannada-vowel-letters.txt b/test/shape/texts/in-house/shaper-indic/script-kannada/kannada-vowel-letters.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-kannada/kannada-vowel-letters.txt rename to test/shape/texts/in-house/shaper-indic/script-kannada/kannada-vowel-letters.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/misc/misc.txt b/test/shape/texts/in-house/shaper-indic/script-kannada/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-kannada/misc/misc.txt rename to test/shape/texts/in-house/shaper-indic/script-kannada/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/misc/right-matras.txt b/test/shape/texts/in-house/shaper-indic/script-kannada/misc/right-matras.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-kannada/misc/right-matras.txt rename to test/shape/texts/in-house/shaper-indic/script-kannada/misc/right-matras.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/LICENSE b/test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/LICENSE similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/LICENSE rename to test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/LICENSE diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/README b/test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/README similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/README rename to test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/README diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/SOURCES b/test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/SOURCES similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/SOURCES rename to test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/SOURCES diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt b/test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt rename to test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt b/test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt rename to test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt rename to test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt rename to test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt rename to test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt b/test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt rename to test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/gsub/IndicFontFeatureGSUB.txt b/test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/gsub/IndicFontFeatureGSUB.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/gsub/IndicFontFeatureGSUB.txt rename to test/shape/texts/in-house/shaper-indic/script-kannada/utrrs/gsub/IndicFontFeatureGSUB.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/malayalam-vowel-letters.txt b/test/shape/texts/in-house/shaper-indic/script-malayalam/malayalam-vowel-letters.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/malayalam-vowel-letters.txt rename to test/shape/texts/in-house/shaper-indic/script-malayalam/malayalam-vowel-letters.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/cibu.txt b/test/shape/texts/in-house/shaper-indic/script-malayalam/misc/cibu.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/cibu.txt rename to test/shape/texts/in-house/shaper-indic/script-malayalam/misc/cibu.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/dot-reph.txt b/test/shape/texts/in-house/shaper-indic/script-malayalam/misc/dot-reph.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/dot-reph.txt rename to test/shape/texts/in-house/shaper-indic/script-malayalam/misc/dot-reph.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/misc.txt b/test/shape/texts/in-house/shaper-indic/script-malayalam/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/misc.txt rename to test/shape/texts/in-house/shaper-indic/script-malayalam/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/LICENSE b/test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/LICENSE similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/LICENSE rename to test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/LICENSE diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/README b/test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/README similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/README rename to test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/README diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/SOURCES b/test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/SOURCES similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/SOURCES rename to test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/SOURCES diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt b/test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt rename to test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt rename to test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt rename to test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt rename to test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/gsub/IndicFontFeatureGSUB.txt b/test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/gsub/IndicFontFeatureGSUB.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/gsub/IndicFontFeatureGSUB.txt rename to test/shape/texts/in-house/shaper-indic/script-malayalam/utrrs/gsub/IndicFontFeatureGSUB.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/misc/bindu.txt b/test/shape/texts/in-house/shaper-indic/script-oriya/misc/bindu.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-oriya/misc/bindu.txt rename to test/shape/texts/in-house/shaper-indic/script-oriya/misc/bindu.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/misc/misc.txt b/test/shape/texts/in-house/shaper-indic/script-oriya/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-oriya/misc/misc.txt rename to test/shape/texts/in-house/shaper-indic/script-oriya/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/oriya-vowel-letters.txt b/test/shape/texts/in-house/shaper-indic/script-oriya/oriya-vowel-letters.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-oriya/oriya-vowel-letters.txt rename to test/shape/texts/in-house/shaper-indic/script-oriya/oriya-vowel-letters.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/LICENSE b/test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/LICENSE similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/LICENSE rename to test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/LICENSE diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/README b/test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/README similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/README rename to test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/README diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/SOURCES b/test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/SOURCES similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/SOURCES rename to test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/SOURCES diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt b/test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt rename to test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt b/test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt rename to test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt rename to test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-OriyaSpecific.txt b/test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-OriyaSpecific.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-OriyaSpecific.txt rename to test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-OriyaSpecific.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt rename to test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt rename to test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/gsub/IndicFontFeatureGSUB.txt b/test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/gsub/IndicFontFeatureGSUB.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/gsub/IndicFontFeatureGSUB.txt rename to test/shape/texts/in-house/shaper-indic/script-oriya/utrrs/gsub/IndicFontFeatureGSUB.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/extensive.txt b/test/shape/texts/in-house/shaper-indic/script-sinhala/misc/extensive.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/extensive.txt rename to test/shape/texts/in-house/shaper-indic/script-sinhala/misc/extensive.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/misc.txt b/test/shape/texts/in-house/shaper-indic/script-sinhala/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/misc.txt rename to test/shape/texts/in-house/shaper-indic/script-sinhala/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/reph.txt b/test/shape/texts/in-house/shaper-indic/script-sinhala/misc/reph.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/reph.txt rename to test/shape/texts/in-house/shaper-indic/script-sinhala/misc/reph.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/split-matras.txt b/test/shape/texts/in-house/shaper-indic/script-sinhala/misc/split-matras.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/split-matras.txt rename to test/shape/texts/in-house/shaper-indic/script-sinhala/misc/split-matras.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/LICENSE b/test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/LICENSE similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/LICENSE rename to test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/LICENSE diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/README b/test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/README similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/README rename to test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/README diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/SOURCES b/test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/SOURCES similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/SOURCES rename to test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/SOURCES diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt rename to test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Punctuation.txt b/test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Punctuation.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Punctuation.txt rename to test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Punctuation.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt rename to test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gpos/IndicFontFeatureGPOS.txt b/test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/gpos/IndicFontFeatureGPOS.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gpos/IndicFontFeatureGPOS.txt rename to test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/gpos/IndicFontFeatureGPOS.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt b/test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt rename to test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt b/test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt rename to test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt b/test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt rename to test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Special-Cases.txt b/test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Special-Cases.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Special-Cases.txt rename to test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Special-Cases.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-TouchingLetters.txt b/test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-TouchingLetters.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-TouchingLetters.txt rename to test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-TouchingLetters.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt b/test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt rename to test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB.txt b/test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB.txt rename to test/shape/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/misc/misc.txt b/test/shape/texts/in-house/shaper-indic/script-tamil/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-tamil/misc/misc.txt rename to test/shape/texts/in-house/shaper-indic/script-tamil/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/LICENSE b/test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/LICENSE similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/LICENSE rename to test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/LICENSE diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/README b/test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/README similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/README rename to test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/README diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/SOURCES b/test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/SOURCES similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/SOURCES rename to test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/SOURCES diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt rename to test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-CurrencySymbols.txt b/test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-CurrencySymbols.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-CurrencySymbols.txt rename to test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-CurrencySymbols.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt rename to test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Numerics.txt b/test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Numerics.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Numerics.txt rename to test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Numerics.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt rename to test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Symbols.txt b/test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Symbols.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Symbols.txt rename to test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Symbols.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-TamilSymbol.txt b/test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-TamilSymbol.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-TamilSymbol.txt rename to test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-TamilSymbol.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt rename to test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt b/test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt rename to test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt b/test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt rename to test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gsub/IndicFontFeatureGSUB.txt b/test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/gsub/IndicFontFeatureGSUB.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gsub/IndicFontFeatureGSUB.txt rename to test/shape/texts/in-house/shaper-indic/script-tamil/utrrs/gsub/IndicFontFeatureGSUB.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/misc/misc.txt b/test/shape/texts/in-house/shaper-indic/script-telugu/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-telugu/misc/misc.txt rename to test/shape/texts/in-house/shaper-indic/script-telugu/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/telugu-vowel-letters.txt b/test/shape/texts/in-house/shaper-indic/script-telugu/telugu-vowel-letters.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-telugu/telugu-vowel-letters.txt rename to test/shape/texts/in-house/shaper-indic/script-telugu/telugu-vowel-letters.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/LICENSE b/test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/LICENSE similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/LICENSE rename to test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/LICENSE diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/README b/test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/README similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/README rename to test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/README diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/SOURCES b/test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/SOURCES similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/SOURCES rename to test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/SOURCES diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt b/test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt rename to test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt rename to test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt rename to test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt rename to test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt rename to test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt b/test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt rename to test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/gsub/IndicFontFeatureGSUB.txt b/test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/gsub/IndicFontFeatureGSUB.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/gsub/IndicFontFeatureGSUB.txt rename to test/shape/texts/in-house/shaper-indic/script-telugu/utrrs/gsub/IndicFontFeatureGSUB.txt diff --git a/test/shaping/texts/in-house/shaper-khmer/misc.txt b/test/shape/texts/in-house/shaper-khmer/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-khmer/misc.txt rename to test/shape/texts/in-house/shaper-khmer/misc.txt diff --git a/test/shaping/texts/in-house/shaper-khmer/other-marks-invalid.txt b/test/shape/texts/in-house/shaper-khmer/other-marks-invalid.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-khmer/other-marks-invalid.txt rename to test/shape/texts/in-house/shaper-khmer/other-marks-invalid.txt diff --git a/test/shaping/texts/in-house/shaper-khmer/other-marks.txt b/test/shape/texts/in-house/shaper-khmer/other-marks.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-khmer/other-marks.txt rename to test/shape/texts/in-house/shaper-khmer/other-marks.txt diff --git a/test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/misc.txt b/test/shape/texts/in-house/shaper-myanmar/script-myanmar/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/misc.txt rename to test/shape/texts/in-house/shaper-myanmar/script-myanmar/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/otspec.txt b/test/shape/texts/in-house/shaper-myanmar/script-myanmar/misc/otspec.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/otspec.txt rename to test/shape/texts/in-house/shaper-myanmar/script-myanmar/misc/otspec.txt diff --git a/test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/utn11.txt b/test/shape/texts/in-house/shaper-myanmar/script-myanmar/misc/utn11.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/utn11.txt rename to test/shape/texts/in-house/shaper-myanmar/script-myanmar/misc/utn11.txt diff --git a/test/shaping/texts/in-house/shaper-thai/script-lao/misc/sara-am.txt b/test/shape/texts/in-house/shaper-thai/script-lao/misc/sara-am.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-thai/script-lao/misc/sara-am.txt rename to test/shape/texts/in-house/shaper-thai/script-lao/misc/sara-am.txt diff --git a/test/shaping/texts/in-house/shaper-thai/script-thai/misc/misc.txt b/test/shape/texts/in-house/shaper-thai/script-thai/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-thai/script-thai/misc/misc.txt rename to test/shape/texts/in-house/shaper-thai/script-thai/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-thai/script-thai/misc/phinthu.txt b/test/shape/texts/in-house/shaper-thai/script-thai/misc/phinthu.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-thai/script-thai/misc/phinthu.txt rename to test/shape/texts/in-house/shaper-thai/script-thai/misc/phinthu.txt diff --git a/test/shaping/texts/in-house/shaper-thai/script-thai/misc/pua-shaping.txt b/test/shape/texts/in-house/shaper-thai/script-thai/misc/pua-shaping.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-thai/script-thai/misc/pua-shaping.txt rename to test/shape/texts/in-house/shaper-thai/script-thai/misc/pua-shaping.txt diff --git a/test/shaping/texts/in-house/shaper-thai/script-thai/misc/sara-am.txt b/test/shape/texts/in-house/shaper-thai/script-thai/misc/sara-am.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-thai/script-thai/misc/sara-am.txt rename to test/shape/texts/in-house/shaper-thai/script-thai/misc/sara-am.txt diff --git a/test/shaping/texts/in-house/shaper-tibetan/script-tibetan/misc/contractions.txt b/test/shape/texts/in-house/shaper-tibetan/script-tibetan/misc/contractions.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-tibetan/script-tibetan/misc/contractions.txt rename to test/shape/texts/in-house/shaper-tibetan/script-tibetan/misc/contractions.txt diff --git a/test/shaping/texts/in-house/shaper-tibetan/script-tibetan/misc/misc.txt b/test/shape/texts/in-house/shaper-tibetan/script-tibetan/misc/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-tibetan/script-tibetan/misc/misc.txt rename to test/shape/texts/in-house/shaper-tibetan/script-tibetan/misc/misc.txt diff --git a/test/shaping/texts/in-house/shaper-use/script-batak/misc.txt b/test/shape/texts/in-house/shaper-use/script-batak/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-use/script-batak/misc.txt rename to test/shape/texts/in-house/shaper-use/script-batak/misc.txt diff --git a/test/shaping/texts/in-house/shaper-use/script-buginese/misc.txt b/test/shape/texts/in-house/shaper-use/script-buginese/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-use/script-buginese/misc.txt rename to test/shape/texts/in-house/shaper-use/script-buginese/misc.txt diff --git a/test/shaping/texts/in-house/shaper-use/script-cham/misc.txt b/test/shape/texts/in-house/shaper-use/script-cham/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-use/script-cham/misc.txt rename to test/shape/texts/in-house/shaper-use/script-cham/misc.txt diff --git a/test/shaping/texts/in-house/shaper-use/script-javanese/misc.txt b/test/shape/texts/in-house/shaper-use/script-javanese/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-use/script-javanese/misc.txt rename to test/shape/texts/in-house/shaper-use/script-javanese/misc.txt diff --git a/test/shaping/texts/in-house/shaper-use/script-kaithi/misc.txt b/test/shape/texts/in-house/shaper-use/script-kaithi/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-use/script-kaithi/misc.txt rename to test/shape/texts/in-house/shaper-use/script-kaithi/misc.txt diff --git a/test/shaping/texts/in-house/shaper-use/script-kharoshti/misc.txt b/test/shape/texts/in-house/shaper-use/script-kharoshti/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-use/script-kharoshti/misc.txt rename to test/shape/texts/in-house/shaper-use/script-kharoshti/misc.txt diff --git a/test/shaping/texts/in-house/shaper-use/script-tai-tham/misc.txt b/test/shape/texts/in-house/shaper-use/script-tai-tham/misc.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-use/script-tai-tham/misc.txt rename to test/shape/texts/in-house/shaper-use/script-tai-tham/misc.txt diff --git a/test/shaping/texts/in-house/shaper-use/script-tai-tham/torture.txt b/test/shape/texts/in-house/shaper-use/script-tai-tham/torture.txt similarity index 100% rename from test/shaping/texts/in-house/shaper-use/script-tai-tham/torture.txt rename to test/shape/texts/in-house/shaper-use/script-tai-tham/torture.txt