diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2022-03-03 10:19:40 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2022-11-14 10:39:35 +0100 |
| commit | e7ef6564b0145fec59e9bdae24a9f3cc50c6e68b (patch) | |
| tree | 227d27e1ad96df3f0178569f16b4927aefd06e41 | |
| parent | dd83beae5b8f294cd9d5197eab60f2c028844626 (diff) | |
| download | vala-e7ef6564b0145fec59e9bdae24a9f3cc50c6e68b.tar.gz | |
tests: Organize them in suites
| -rw-r--r-- | tests/meson.build | 13 | ||||
| -rw-r--r-- | valadoc/tests/meson.build | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/tests/meson.build b/tests/meson.build index 38e77ed8c..26c8f7aaf 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1430,12 +1430,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, @@ -1448,17 +1450,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, @@ -1471,39 +1476,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, @@ -1516,6 +1528,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', ) |