From 419c2d0a00d6f5c5c8a3a8ecd705aa1fa97c4768 Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Sun, 31 May 2020 02:33:36 +0430 Subject: [PATCH] [test/text-rendering-tests] Adopt the update script with meson --- .../data/text-rendering-tests/meson.build | 95 +++++++++++++++++++ .../data/text-rendering-tests/update.py | 8 ++ test/shaping/meson.build | 87 +---------------- 3 files changed, 105 insertions(+), 85 deletions(-) create mode 100644 test/shaping/data/text-rendering-tests/meson.build diff --git a/test/shaping/data/text-rendering-tests/meson.build b/test/shaping/data/text-rendering-tests/meson.build new file mode 100644 index 000000000..0d950f5e6 --- /dev/null +++ b/test/shaping/data/text-rendering-tests/meson.build @@ -0,0 +1,95 @@ +text_rendering_tests = [ + 'AVAR-1.tests', + 'CFF-1.tests', + 'CFF-2.tests', + 'CFF2-1.tests', + 'CMAP-1.tests', + 'CMAP-2.tests', + 'CVAR-1.tests', + 'CVAR-2.tests', + 'GLYF-1.tests', + 'GPOS-1.tests', + 'GPOS-2.tests', + 'GPOS-3.tests', + 'GPOS-4.tests', + 'GPOS-5.tests', + 'GSUB-1.tests', + 'GSUB-2.tests', + 'GSUB-3.tests', + 'GVAR-1.tests', + 'GVAR-2.tests', + 'GVAR-3.tests', + 'GVAR-4.tests', + 'GVAR-5.tests', + 'GVAR-6.tests', + 'GVAR-7.tests', + 'GVAR-8.tests', + 'GVAR-9.tests', + 'HVAR-1.tests', + 'HVAR-2.tests', + 'KERN-1.tests', + 'KERN-2.tests', + 'MORX-1.tests', + 'MORX-10.tests', + 'MORX-11.tests', + 'MORX-12.tests', + 'MORX-13.tests', + 'MORX-14.tests', + 'MORX-16.tests', + 'MORX-17.tests', + 'MORX-18.tests', + 'MORX-19.tests', + 'MORX-2.tests', + 'MORX-20.tests', + 'MORX-21.tests', + 'MORX-22.tests', + 'MORX-23.tests', + 'MORX-24.tests', + 'MORX-25.tests', + 'MORX-26.tests', + 'MORX-27.tests', + 'MORX-28.tests', + 'MORX-29.tests', + 'MORX-3.tests', + 'MORX-30.tests', + 'MORX-31.tests', + 'MORX-32.tests', + 'MORX-33.tests', + 'MORX-34.tests', + 'MORX-35.tests', + 'MORX-36.tests', + 'MORX-37.tests', + 'MORX-38.tests', + 'MORX-39.tests', + 'MORX-4.tests', + 'MORX-40.tests', + 'MORX-41.tests', + 'MORX-5.tests', + 'MORX-6.tests', + 'MORX-7.tests', + 'MORX-8.tests', + 'MORX-9.tests', + 'SFNT-1.tests', + 'SFNT-2.tests', + 'SHBALI-3.tests', + 'SHKNDA-1.tests', +] + +disabled_text_rendering_tests = [ + 'CMAP-3.tests', + 'SHARAN-1.tests', + 'SHBALI-1.tests', + 'SHBALI-2.tests', + 'SHKNDA-2.tests', + 'SHKNDA-3.tests', + 'SHLANA-1.tests', + 'SHLANA-10.tests', + 'SHLANA-2.tests', + 'SHLANA-3.tests', + 'SHLANA-4.tests', + 'SHLANA-5.tests', + 'SHLANA-6.tests', + 'SHLANA-7.tests', + 'SHLANA-8.tests', + 'SHLANA-9.tests', +] diff --git a/test/shaping/data/text-rendering-tests/update.py b/test/shaping/data/text-rendering-tests/update.py index fd407105a..7b8aeb6ea 100755 --- a/test/shaping/data/text-rendering-tests/update.py +++ b/test/shaping/data/text-rendering-tests/update.py @@ -99,6 +99,14 @@ for x in sorted (os.listdir ('text-rendering-tests/testcases')): subprocess.run([git, 'add', 'tests'], check=True) +with open ('meson.build', 'w') as f: f.write ('\n'.join ( + ['text_rendering_tests = ['] + + [' \'%s\',' % x.split('tests/')[1] for x in tests] + + [']', '', 'disabled_text_rendering_tests = ['] + + [' \'%s\',' % x.split('tests/')[1] for x in disabled_tests] + + [']', ''] +)) + with open ('Makefile.sources', 'w') as f: f.write ('\n'.join ( ['TESTS = \\'] + [' %s \\' % x for x in tests] + diff --git a/test/shaping/meson.build b/test/shaping/meson.build index 0ee112c87..d30158532 100644 --- a/test/shaping/meson.build +++ b/test/shaping/meson.build @@ -183,91 +183,8 @@ aots_tests = [ 'lookupflag_ignore_marks.tests', ] -text_rendering_tests = [ - 'AVAR-1.tests', - 'CFF-1.tests', - 'CFF2-1.tests', - 'CFF-2.tests', - 'CMAP-1.tests', - 'CMAP-2.tests', - 'CVAR-1.tests', - 'CVAR-2.tests', - 'GLYF-1.tests', - 'GPOS-1.tests', - 'GPOS-2.tests', - 'GPOS-3.tests', - 'GPOS-4.tests', - 'GPOS-5.tests', - 'GSUB-1.tests', - 'GSUB-2.tests', - 'GSUB-3.tests', - 'GVAR-1.tests', - 'GVAR-2.tests', - 'GVAR-3.tests', - 'GVAR-4.tests', - 'GVAR-5.tests', - 'GVAR-6.tests', - 'GVAR-7.tests', - 'GVAR-8.tests', - 'GVAR-9.tests', - 'HVAR-1.tests', - 'HVAR-2.tests', - 'KERN-1.tests', - 'KERN-2.tests', - 'MORX-10.tests', - 'MORX-11.tests', - 'MORX-12.tests', - 'MORX-13.tests', - 'MORX-14.tests', - 'MORX-16.tests', - 'MORX-17.tests', - 'MORX-18.tests', - 'MORX-19.tests', - 'MORX-1.tests', - 'MORX-20.tests', - 'MORX-21.tests', - 'MORX-22.tests', - 'MORX-23.tests', - 'MORX-24.tests', - 'MORX-25.tests', - 'MORX-26.tests', - 'MORX-27.tests', - 'MORX-28.tests', - 'MORX-29.tests', - 'MORX-2.tests', - 'MORX-30.tests', - 'MORX-31.tests', - 'MORX-32.tests', - 'MORX-33.tests', - 'MORX-34.tests', - 'MORX-35.tests', - 'MORX-36.tests', - 'MORX-37.tests', - 'MORX-38.tests', - 'MORX-39.tests', - 'MORX-3.tests', - 'MORX-40.tests', - 'MORX-41.tests', - 'MORX-4.tests', - 'MORX-5.tests', - 'MORX-6.tests', - 'MORX-7.tests', - 'MORX-8.tests', - 'MORX-9.tests', - 'SHBALI-3.tests', - 'SHKNDA-1.tests', -] - -disabled_text_rendering_tests = [ - 'CMAP-3.tests', - 'MORX-31.tests', - 'MORX-41.tests', - 'SHARAN-1.tests', - 'SHBALI-1.tests', - 'SHBALI-2.tests', - 'SHKNDA-2.tests', - 'SHKNDA-3.tests', -] +# to import text_rendering_tests from data/text-rendering-tests/meson.build +subdir('data/text-rendering-tests') shaping_run_tests_py = find_program('run-tests.py')