From 2d91662294ebe8d4856342464243f0a9fa734702 Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Thu, 11 Jun 2020 19:04:08 +0430 Subject: [PATCH] [meson] move tests lists to their directories We had to do so for text-rendering-tests list, let's apply the same for the rest also. --- test/shaping/data/aots/Makefile.am | 1 + test/shaping/data/aots/meson.build | 123 ++++++++++++++++ test/shaping/data/in-house/Makefile.am | 1 + test/shaping/data/in-house/meson.build | 60 ++++++++ test/shaping/meson.build | 189 +------------------------ 5 files changed, 188 insertions(+), 186 deletions(-) create mode 100644 test/shaping/data/aots/meson.build create mode 100644 test/shaping/data/in-house/meson.build diff --git a/test/shaping/data/aots/Makefile.am b/test/shaping/data/aots/Makefile.am index a2a009b48..543448f0b 100644 --- a/test/shaping/data/aots/Makefile.am +++ b/test/shaping/data/aots/Makefile.am @@ -10,6 +10,7 @@ EXTRA_DIST = \ COPYING \ fonts \ update.py \ + meson.build \ $(TESTS) \ $(NULL) diff --git a/test/shaping/data/aots/meson.build b/test/shaping/data/aots/meson.build new file mode 100644 index 000000000..7e3c64b77 --- /dev/null +++ b/test/shaping/data/aots/meson.build @@ -0,0 +1,123 @@ +aots_tests = [ + 'classdef1_empty.tests', + 'classdef1_multiple.tests', + 'classdef1_single.tests', + 'classdef1.tests', + 'classdef2_empty.tests', + 'classdef2_multiple.tests', + 'classdef2_single.tests', + 'classdef2.tests', + 'gpos_chaining1_boundary.tests', + 'gpos_chaining1_lookupflag.tests', + 'gpos_chaining1_multiple_subrules.tests', + 'gpos_chaining1_next_glyph.tests', + 'gpos_chaining1_simple.tests', + 'gpos_chaining1_successive.tests', + 'gpos_chaining2_boundary.tests', + 'gpos_chaining2_lookupflag.tests', + 'gpos_chaining2_multiple_subrules.tests', + 'gpos_chaining2_next_glyph.tests', + 'gpos_chaining2_simple.tests', + 'gpos_chaining2_successive.tests', + 'gpos_chaining3_boundary.tests', + 'gpos_chaining3_lookupflag.tests', + 'gpos_chaining3_next_glyph.tests', + 'gpos_chaining3_simple.tests', + 'gpos_chaining3_successive.tests', + 'gpos_context1_boundary.tests', + 'gpos_context1_expansion.tests', + 'gpos_context1_lookupflag.tests', + 'gpos_context1_multiple_subrules.tests', + 'gpos_context1_next_glyph.tests', + 'gpos_context1_simple.tests', + 'gpos_context1_successive.tests', + 'gpos_context2_boundary.tests', + 'gpos_context2_classes.tests', + 'gpos_context2_expansion.tests', + 'gpos_context2_lookupflag.tests', + 'gpos_context2_multiple_subrules.tests', + 'gpos_context2_next_glyph.tests', + 'gpos_context2_simple.tests', + 'gpos_context2_successive.tests', + 'gpos_context3_boundary.tests', + 'gpos_context3_lookupflag.tests', + 'gpos_context3_next_glyph.tests', + 'gpos_context3_simple.tests', + 'gpos_context3_successive.tests', + 'gpos1_1_lookupflag.tests', + 'gpos1_1_simple.tests', + 'gpos1_2_lookupflag.tests', + 'gpos1_2.tests', + 'gpos2_1_lookupflag.tests', + 'gpos2_1_next_glyph.tests', + 'gpos2_1_simple.tests', + 'gpos2_1.tests', + 'gpos2_2.tests', + 'gpos3_lookupflag.tests', + 'gpos3.tests', + 'gpos4_lookupflag.tests', + 'gpos4_multiple_anchors.tests', + 'gpos4_simple.tests', + 'gpos5.tests', + 'gpos6.tests', + 'gpos7_1.tests', + 'gpos9.tests', + 'gsub_chaining1_boundary.tests', + 'gsub_chaining1_lookupflag.tests', + 'gsub_chaining1_multiple_subrules.tests', + 'gsub_chaining1_next_glyph.tests', + 'gsub_chaining1_simple.tests', + 'gsub_chaining1_successive.tests', + 'gsub_chaining2_boundary.tests', + 'gsub_chaining2_lookupflag.tests', + 'gsub_chaining2_multiple_subrules.tests', + 'gsub_chaining2_next_glyph.tests', + 'gsub_chaining2_simple.tests', + 'gsub_chaining2_successive.tests', + 'gsub_chaining3_boundary.tests', + 'gsub_chaining3_lookupflag.tests', + 'gsub_chaining3_next_glyph.tests', + 'gsub_chaining3_simple.tests', + 'gsub_chaining3_successive.tests', + 'gsub_context1_boundary.tests', + 'gsub_context1_expansion.tests', + 'gsub_context1_lookupflag.tests', + 'gsub_context1_multiple_subrules.tests', + 'gsub_context1_next_glyph.tests', + 'gsub_context1_simple.tests', + 'gsub_context1_successive.tests', + 'gsub_context2_boundary.tests', + 'gsub_context2_classes.tests', + 'gsub_context2_expansion.tests', + 'gsub_context2_lookupflag.tests', + 'gsub_context2_multiple_subrules.tests', + 'gsub_context2_next_glyph.tests', + 'gsub_context2_simple.tests', + 'gsub_context2_successive.tests', + 'gsub_context3_boundary.tests', + 'gsub_context3_lookupflag.tests', + 'gsub_context3_next_glyph.tests', + 'gsub_context3_simple.tests', + 'gsub_context3_successive.tests', + 'gsub1_1_lookupflag.tests', + 'gsub1_1_modulo.tests', + 'gsub1_1_simple.tests', + 'gsub1_2_lookupflag.tests', + 'gsub1_2_simple.tests', + 'gsub2_1_lookupflag.tests', + 'gsub2_1_multiple_sequences.tests', + 'gsub2_1_simple.tests', + 'gsub3_1_lookupflag.tests', + 'gsub3_1_multiple.tests', + 'gsub3_1_simple.tests', + 'gsub4_1_lookupflag.tests', + 'gsub4_1_multiple_ligatures.tests', + 'gsub4_1_multiple_ligsets.tests', + 'gsub4_1_simple.tests', + 'gsub7.tests', + 'lookupflag_ignore_attach.tests', + 'lookupflag_ignore_base.tests', + 'lookupflag_ignore_combination.tests', + 'lookupflag_ignore_ligatures.tests', + 'lookupflag_ignore_marks.tests', +] diff --git a/test/shaping/data/in-house/Makefile.am b/test/shaping/data/in-house/Makefile.am index 8a2a07657..15ac13c2f 100644 --- a/test/shaping/data/in-house/Makefile.am +++ b/test/shaping/data/in-house/Makefile.am @@ -9,6 +9,7 @@ lib: EXTRA_DIST = \ COPYING \ fonts \ + meson.build \ $(TESTS) \ $(NULL) diff --git a/test/shaping/data/in-house/meson.build b/test/shaping/data/in-house/meson.build new file mode 100644 index 000000000..98195bda1 --- /dev/null +++ b/test/shaping/data/in-house/meson.build @@ -0,0 +1,60 @@ +in_house_tests = [ + 'aat-trak.tests', + 'aat-morx.tests', + 'arabic-fallback-shaping.tests', + 'arabic-feature-order.tests', + 'arabic-like-joining.tests', + 'arabic-mark-attach.tests', + 'arabic-mark-order.tests', + 'arabic-stch.tests', + 'automatic-fractions.tests', + 'cluster.tests', + 'collections.tests', + 'color-fonts.tests', + 'context-matching.tests', + 'cursive-positioning.tests', + 'default-ignorables.tests', + 'emoji.tests', + 'fallback-positioning.tests', + 'hangul-jamo.tests', + 'hyphens.tests', + 'indic-consonant-with-stacker.tests', + 'indic-decompose.tests', + 'indic-init.tests', + 'indic-joiner-candrabindu.tests', + 'indic-joiners.tests', + 'indic-old-spec.tests', + 'indic-pref-blocking.tests', + 'indic-script-extensions.tests', + 'indic-special-cases.tests', + 'indic-syllable.tests', + 'indic-vowel-letter-spoofing.tests', + 'kern-format2.tests', + 'khmer-mark-order.tests', + 'khmer-misc.tests', + 'language-tags.tests', + 'ligature-id.tests', + 'macos.tests', + 'mark-attachment.tests', + 'mark-filtering-sets.tests', + 'mongolian-variation-selector.tests', + 'myanmar-syllable.tests', + 'myanmar-zawgyi.tests', + 'none-directional.tests', + 'positioning-features.tests', + 'rand.tests', + 'rotation.tests', + 'spaces.tests', + 'simple.tests', + 'sinhala.tests', + 'tibetan-contractions-1.tests', + 'tibetan-contractions-2.tests', + 'tibetan-vowels.tests', + 'use.tests', + 'use-indic3.tests', + 'use-marchen.tests', + 'use-syllable.tests', + 'variations-rvrn.tests', + 'vertical.tests', + 'zero-width-marks.tests', +] diff --git a/test/shaping/meson.build b/test/shaping/meson.build index d30158532..a32263116 100644 --- a/test/shaping/meson.build +++ b/test/shaping/meson.build @@ -1,190 +1,7 @@ -in_house_tests = [ - 'aat-trak.tests', - 'aat-morx.tests', - 'arabic-fallback-shaping.tests', - 'arabic-feature-order.tests', - 'arabic-like-joining.tests', - 'arabic-mark-attach.tests', - 'arabic-mark-order.tests', - 'arabic-stch.tests', - 'automatic-fractions.tests', - 'cluster.tests', - 'collections.tests', - 'color-fonts.tests', - 'context-matching.tests', - 'cursive-positioning.tests', - 'default-ignorables.tests', - 'emoji.tests', - 'fallback-positioning.tests', - 'hangul-jamo.tests', - 'hyphens.tests', - 'indic-consonant-with-stacker.tests', - 'indic-decompose.tests', - 'indic-init.tests', - 'indic-joiner-candrabindu.tests', - 'indic-joiners.tests', - 'indic-old-spec.tests', - 'indic-pref-blocking.tests', - 'indic-script-extensions.tests', - 'indic-special-cases.tests', - 'indic-syllable.tests', - 'indic-vowel-letter-spoofing.tests', - 'kern-format2.tests', - 'khmer-mark-order.tests', - 'khmer-misc.tests', - 'language-tags.tests', - 'ligature-id.tests', - 'macos.tests', - 'mark-attachment.tests', - 'mark-filtering-sets.tests', - 'mongolian-variation-selector.tests', - 'myanmar-syllable.tests', - 'myanmar-zawgyi.tests', - 'none-directional.tests', - 'positioning-features.tests', - 'rand.tests', - 'rotation.tests', - 'spaces.tests', - 'simple.tests', - 'sinhala.tests', - 'tibetan-contractions-1.tests', - 'tibetan-contractions-2.tests', - 'tibetan-vowels.tests', - 'use.tests', - 'use-indic3.tests', - 'use-marchen.tests', - 'use-syllable.tests', - 'variations-rvrn.tests', - 'vertical.tests', - 'zero-width-marks.tests', -] -aots_tests = [ - 'classdef1_empty.tests', - 'classdef1_multiple.tests', - 'classdef1_single.tests', - 'classdef1.tests', - 'classdef2_empty.tests', - 'classdef2_multiple.tests', - 'classdef2_single.tests', - 'classdef2.tests', - 'gpos_chaining1_boundary.tests', - 'gpos_chaining1_lookupflag.tests', - 'gpos_chaining1_multiple_subrules.tests', - 'gpos_chaining1_next_glyph.tests', - 'gpos_chaining1_simple.tests', - 'gpos_chaining1_successive.tests', - 'gpos_chaining2_boundary.tests', - 'gpos_chaining2_lookupflag.tests', - 'gpos_chaining2_multiple_subrules.tests', - 'gpos_chaining2_next_glyph.tests', - 'gpos_chaining2_simple.tests', - 'gpos_chaining2_successive.tests', - 'gpos_chaining3_boundary.tests', - 'gpos_chaining3_lookupflag.tests', - 'gpos_chaining3_next_glyph.tests', - 'gpos_chaining3_simple.tests', - 'gpos_chaining3_successive.tests', - 'gpos_context1_boundary.tests', - 'gpos_context1_expansion.tests', - 'gpos_context1_lookupflag.tests', - 'gpos_context1_multiple_subrules.tests', - 'gpos_context1_next_glyph.tests', - 'gpos_context1_simple.tests', - 'gpos_context1_successive.tests', - 'gpos_context2_boundary.tests', - 'gpos_context2_classes.tests', - 'gpos_context2_expansion.tests', - 'gpos_context2_lookupflag.tests', - 'gpos_context2_multiple_subrules.tests', - 'gpos_context2_next_glyph.tests', - 'gpos_context2_simple.tests', - 'gpos_context2_successive.tests', - 'gpos_context3_boundary.tests', - 'gpos_context3_lookupflag.tests', - 'gpos_context3_next_glyph.tests', - 'gpos_context3_simple.tests', - 'gpos_context3_successive.tests', - 'gpos1_1_lookupflag.tests', - 'gpos1_1_simple.tests', - 'gpos1_2_lookupflag.tests', - 'gpos1_2.tests', - 'gpos2_1_lookupflag.tests', - 'gpos2_1_next_glyph.tests', - 'gpos2_1_simple.tests', - 'gpos2_1.tests', - 'gpos2_2.tests', - 'gpos3_lookupflag.tests', - 'gpos3.tests', - 'gpos4_lookupflag.tests', - 'gpos4_multiple_anchors.tests', - 'gpos4_simple.tests', - 'gpos5.tests', - 'gpos6.tests', - 'gpos7_1.tests', - 'gpos9.tests', - 'gsub_chaining1_boundary.tests', - 'gsub_chaining1_lookupflag.tests', - 'gsub_chaining1_multiple_subrules.tests', - 'gsub_chaining1_next_glyph.tests', - 'gsub_chaining1_simple.tests', - 'gsub_chaining1_successive.tests', - 'gsub_chaining2_boundary.tests', - 'gsub_chaining2_lookupflag.tests', - 'gsub_chaining2_multiple_subrules.tests', - 'gsub_chaining2_next_glyph.tests', - 'gsub_chaining2_simple.tests', - 'gsub_chaining2_successive.tests', - 'gsub_chaining3_boundary.tests', - 'gsub_chaining3_lookupflag.tests', - 'gsub_chaining3_next_glyph.tests', - 'gsub_chaining3_simple.tests', - 'gsub_chaining3_successive.tests', - 'gsub_context1_boundary.tests', - 'gsub_context1_expansion.tests', - 'gsub_context1_lookupflag.tests', - 'gsub_context1_multiple_subrules.tests', - 'gsub_context1_next_glyph.tests', - 'gsub_context1_simple.tests', - 'gsub_context1_successive.tests', - 'gsub_context2_boundary.tests', - 'gsub_context2_classes.tests', - 'gsub_context2_expansion.tests', - 'gsub_context2_lookupflag.tests', - 'gsub_context2_multiple_subrules.tests', - 'gsub_context2_next_glyph.tests', - 'gsub_context2_simple.tests', - 'gsub_context2_successive.tests', - 'gsub_context3_boundary.tests', - 'gsub_context3_lookupflag.tests', - 'gsub_context3_next_glyph.tests', - 'gsub_context3_simple.tests', - 'gsub_context3_successive.tests', - 'gsub1_1_lookupflag.tests', - 'gsub1_1_modulo.tests', - 'gsub1_1_simple.tests', - 'gsub1_2_lookupflag.tests', - 'gsub1_2_simple.tests', - 'gsub2_1_lookupflag.tests', - 'gsub2_1_multiple_sequences.tests', - 'gsub2_1_simple.tests', - 'gsub3_1_lookupflag.tests', - 'gsub3_1_multiple.tests', - 'gsub3_1_simple.tests', - 'gsub4_1_lookupflag.tests', - 'gsub4_1_multiple_ligatures.tests', - 'gsub4_1_multiple_ligsets.tests', - 'gsub4_1_simple.tests', - 'gsub7.tests', - 'lookupflag_ignore_attach.tests', - 'lookupflag_ignore_base.tests', - 'lookupflag_ignore_combination.tests', - 'lookupflag_ignore_ligatures.tests', - 'lookupflag_ignore_marks.tests', -] - -# to import text_rendering_tests from data/text-rendering-tests/meson.build -subdir('data/text-rendering-tests') +subdir('data/in-house') # in_house_tests +subdir('data/aots') # aots_tests +subdir('data/text-rendering-tests') # text_rendering_tests shaping_run_tests_py = find_program('run-tests.py')