[vala/wip/meson: 17/23] tests: Organize them in suites




commit 84e2446c3e6c575a8cd132f14b184a8ca31bd9d0
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Thu Mar 3 10:19:40 2022 +0100

    tests: Organize them in suites

 tests/meson.build         | 13 +++++++++++++
 valadoc/tests/meson.build |  5 ++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/tests/meson.build b/tests/meson.build
index 2924ce995..8608a77ba 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1411,12 +1411,14 @@ endforeach
 preparetest = find_program('prepare-test.py')
 
 foreach case : test_cases
+       suite = case.split('/')
        if case.endswith('.vala') or case.endswith('.gs')
                test(case,
                        valac_exe,
                        workdir: meson.current_build_dir(),
                        args: vala_flags + ['--pkg', 'gio-2.0', join_paths(meson.current_source_dir(), case)],
                        env: test_envars,
+                       suite: suite[0],
                )
        else
                invalid_case = run_command(preparetest,
@@ -1429,17 +1431,20 @@ foreach case : test_cases
                        should_fail: true,
                        args: vala_flags + ['--pkg', 'gio-2.0', case.underscorify() + '.vala'],
                        env: test_envars,
+                       suite: suite[0],
                )
        endif
 endforeach
 
 foreach case : test_cases_non_null
+       suite = case.split('/')
        if case.endswith('.vala') or case.endswith('.gs')
                test(case,
                        valac_exe,
                        workdir: meson.current_build_dir(),
                        args: vala_flags + ['--enable-experimental-non-null', '--pkg', 'gio-2.0', 
join_paths(meson.current_source_dir(), case)],
                        env: test_envars,
+                       suite: suite[0],
                )
        else
                invalid_case = run_command(preparetest,
@@ -1452,39 +1457,46 @@ foreach case : test_cases_non_null
                        should_fail: true,
                        args: vala_flags + ['--enable-experimental-non-null', '--pkg', 'gio-2.0', 
case.underscorify() + '.vala'],
                        env: test_envars,
+                       suite: suite[0],
                )
        endif
 endforeach
 
 foreach case : test_cases_linux
+       suite = case.split('/')
        if case.endswith('.vala') or case.endswith('.gs')
                test(case,
                        valac_exe,
                        workdir: meson.current_build_dir(),
                        args: vala_flags + ['--pkg', 'linux', join_paths(meson.current_source_dir(), case)],
                        env: test_envars,
+                       suite: suite[0],
                )
        endif
 endforeach
 
 foreach case : test_cases_posix
+       suite = case.split('/')
        if case.endswith('.vala') or case.endswith('.gs')
                test(case,
                        valac_exe,
                        workdir: meson.current_build_dir(),
                        args: vala_flags + ['--profile', 'posix', '--pkg', 'posix', '--pkg', 'linux', 
join_paths(meson.current_source_dir(), case)],
                        env: test_envars,
+                       suite: suite[0],
                )
        endif
 endforeach
 
 foreach case : test_cases_version_check
+       suite = case.split('/')
        if case.endswith('.vala') or case.endswith('.gs')
                test(case,
                        valac_exe,
                        workdir: meson.current_build_dir(),
                        args: vala_flags + [join_paths(meson.current_source_dir(), case)],
                        env: test_envars + ['PKG_CONFIG_PATH=' + join_paths(meson.current_source_dir(), 
'version')],
+                       suite: suite[0],
                )
        else
                invalid_case = run_command(preparetest,
@@ -1497,6 +1509,7 @@ foreach case : test_cases_version_check
                        should_fail: true,
                        args: vala_flags + [case.underscorify() + '.vala'],
                        env: test_envars + ['PKG_CONFIG_PATH=' + join_paths(meson.current_source_dir(), 
'version')],
+                       suite: suite[0],
                )
        endif
 endforeach
diff --git a/valadoc/tests/meson.build b/valadoc/tests/meson.build
index 6c6be7dd5..10ac347c5 100644
--- a/valadoc/tests/meson.build
+++ b/valadoc/tests/meson.build
@@ -42,11 +42,13 @@ foreach flag : supported_test_cflags
 endforeach
 
 foreach case : test_cases
+       suite = case.split('/')
        test(case,
                valac_exe,
                workdir: meson.current_build_dir(),
                args: vala_flags + [join_paths(meson.current_source_dir(), case)],
-               depends: [valacore_lib, libvaladoc_lib]
+               depends: [valacore_lib, libvaladoc_lib],
+               suite: suite[0],
        )
 endforeach
 
@@ -67,4 +69,5 @@ driver_exe = executable('driver',
 test('valadoc/driver',
        driver_exe,
        workdir: meson.current_build_dir(),
+       suite: 'valadoc',
 )


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]