]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
tests: Organize them in suites
authorRico Tzschichholz <ricotz@ubuntu.com>
Thu, 3 Mar 2022 09:19:40 +0000 (10:19 +0100)
committerRico Tzschichholz <ricotz@ubuntu.com>
Mon, 14 Nov 2022 09:39:35 +0000 (10:39 +0100)
tests/meson.build
valadoc/tests/meson.build

index 38e77ed8cf4b712969079d7be99bc3c7ec4d630c..26c8f7aaf4dc6d3178855be6f21f5e60a1922863 100644 (file)
@@ -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
index 6c6be7dd59edd61a2985d1e07940efb77925a6e4..10ac347c54d3dcaac77bee4b6b5ea6d1de7de0c1 100644 (file)
@@ -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',
 )