From a9d13463b554981cc48349de64bf6d44147ff754 Mon Sep 17 00:00:00 2001
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Sat, 30 May 2020 14:17:56 +0430
Subject: [PATCH] [meson] Categorize tests using `suite: [...]`

So one can run a category of interested tests like

  meson test -Cbuild --suite aots --suite src --print-errorlogs

Intead issuing particular tests which also is possible like

  meson test -Cbuild test-shape --print-errorlogs
---
 src/meson.build          |  8 ++++++--
 test/api/meson.build     |  2 +-
 test/fuzzing/meson.build | 12 +++++++++---
 test/shaping/meson.build |  3 +++
 test/subset/meson.build  |  1 +
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/meson.build b/src/meson.build
index 98d2e92f6..a156e105c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -492,7 +492,7 @@ if get_option('tests').enabled()
       cpp_args: cpp_args + ['-DMAIN', '-UNDEBUG'],
       dependencies: libharfbuzz_dep,
       install: false,
-    ))
+    ), suite: ['src'])
   endforeach
 endif
 
@@ -686,7 +686,11 @@ if get_option('tests').enabled()
   endif
 
   foreach name : dist_check_script
-    test(name, find_program(name + '.py'), env: env, depends: defs_list)
+    test(name, find_program(name + '.py'),
+      env: env,
+      depends: name == 'check-symbols' ? defs_list : [],
+      suite: ['src'],
+    )
   endforeach
 endif
 
diff --git a/test/api/meson.build b/test/api/meson.build
index a67a63cf7..695177315 100644
--- a/test/api/meson.build
+++ b/test/api/meson.build
@@ -83,5 +83,5 @@ foreach source : tests
     dependencies: deps,
     link_with: link_withs,
     install: false,
-  ), env: env)
+  ), env: env, suite: ['api'] + (test_name.contains('-subset') ? ['subset'] : []))
 endforeach
diff --git a/test/fuzzing/meson.build b/test/fuzzing/meson.build
index c9bd2f909..712b97df9 100644
--- a/test/fuzzing/meson.build
+++ b/test/fuzzing/meson.build
@@ -28,7 +28,9 @@ test('shape_fuzzer', find_program('run-shape-fuzzer-tests.py'),
   ],
   depends: [hb_shape_fuzzer_exe, libharfbuzz, libharfbuzz_subset],
   workdir: meson.current_build_dir() / '..' / '..',
-  env: env)
+  env: env,
+  suite: ['fuzzing'],
+)
 
 test('subset_fuzzer', find_program('run-subset-fuzzer-tests.py'),
   args: [
@@ -38,11 +40,15 @@ test('subset_fuzzer', find_program('run-subset-fuzzer-tests.py'),
   # ideally better to break and let meson handles them in parallel
   timeout: 300,
   workdir: meson.current_build_dir() / '..' / '..',
-  env: env)
+  env: env,
+  suite: ['fuzzing'],
+)
 
 test('draw_fuzzer', find_program('run-draw-fuzzer-tests.py'),
   args: [
     hb_draw_fuzzer_exe,
   ],
   workdir: meson.current_build_dir() / '..' / '..',
-  env: env)
+  env: env,
+  suite: ['fuzzing'],
+)
diff --git a/test/shaping/meson.build b/test/shaping/meson.build
index 81852e05a..0ee112c87 100644
--- a/test/shaping/meson.build
+++ b/test/shaping/meson.build
@@ -280,6 +280,7 @@ foreach file_name : in_house_tests
       meson.current_source_dir() / 'data' / 'in-house' / 'tests' / file_name,
     ],
     workdir: meson.current_build_dir() / '..' / '..',
+    suite: ['shaping', 'in-house'],
   )
 endforeach
 
@@ -292,6 +293,7 @@ foreach file_name : aots_tests
       meson.current_source_dir() / 'data' / 'aots' / 'tests' / file_name,
     ],
     workdir: meson.current_build_dir() / '..' / '..',
+    suite: ['shaping', 'aots'],
   )
 endforeach
 
@@ -304,5 +306,6 @@ foreach file_name : text_rendering_tests
       meson.current_source_dir() / 'data' / 'text-rendering-tests' / 'tests' / file_name,
     ],
     workdir: meson.current_build_dir() / '..' / '..',
+    suite: ['shaping', 'text-rendering-tests'],
   )
 endforeach
diff --git a/test/subset/meson.build b/test/subset/meson.build
index 46786e7eb..a75b8f7d5 100644
--- a/test/subset/meson.build
+++ b/test/subset/meson.build
@@ -39,5 +39,6 @@ foreach t : tests
     # ideally better to break and let meson handles them in parallel
     timeout: 500,
     workdir: meson.current_build_dir() / '..' / '..',
+    suite: ['subset'],
   )
 endforeach