| Message ID | 20241105180837.5990-22-farosas@suse.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | tests/qtest: migration-test refactoring | expand |
On Tue, Nov 05, 2024 at 03:08:36PM -0300, Fabiano Rosas wrote: > Allow qtests to be ran by subsystem. Some subsystems, such as > migration, have a large number of tests and we could benefit from > being able to access them from make check without having to run the > full set of qtests. > > This adds the following make check targets: > > make check-qtest-migration > > Signed-off-by: Fabiano Rosas <farosas@suse.de> > --- > I did not include check-qtest-<arch>-<subsys> because meson generates a > long line that affects readability. Can you give an example of that ? I'm wondering how much of a problem it actually is ? Personally when I'm running a subset of tests, I almost always want to limit to just one arch target. > --- > tests/qtest/meson.build | 15 ++++++++++++++- > 1 file changed, 14 insertions(+), 1 deletion(-) Despite the above question, this does what it claims to do at this time, so Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > > diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build > index 806af512d0..e0ba858f5b 100644 > --- a/tests/qtest/meson.build > +++ b/tests/qtest/meson.build > @@ -36,6 +36,13 @@ if enable_modules > qtests_generic += [ 'modules-test' ] > endif > > +qtest_subsystems = { > + 'migration-test-smoke': ['migration'], > + 'migration-test': ['migration'], > + 'cdrom-test': ['block'], > + 'ahci-test': ['block'], > +} > + > qtests_pci = \ > (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) + \ > (config_all_devices.has_key('CONFIG_IVSHMEM_DEVICE') ? ['ivshmem-test'] : []) > @@ -431,6 +438,12 @@ foreach dir : target_dirs > test: executable(test, src, dependencies: deps) > } > endif > + > + suites = ['qtest', 'qtest-' + target_base] > + foreach subsys: qtest_subsystems.get(test, []) > + suites += ['qtest-' + subsys] > + endforeach > + > test('qtest-@0@/@1@'.format(target_base, test), > qtest_executables[test], > depends: [test_deps, qtest_emulator, emulator_modules], > @@ -439,6 +452,6 @@ foreach dir : target_dirs > protocol: 'tap', > timeout: slow_qtests.get(test, 60), > priority: slow_qtests.get(test, 60), > - suite: ['qtest', 'qtest-' + target_base]) > + suite: suites) > endforeach > endforeach > -- > 2.35.3 > With regards, Daniel
Daniel P. Berrangé <berrange@redhat.com> writes: > On Tue, Nov 05, 2024 at 03:08:36PM -0300, Fabiano Rosas wrote: >> Allow qtests to be ran by subsystem. Some subsystems, such as >> migration, have a large number of tests and we could benefit from >> being able to access them from make check without having to run the >> full set of qtests. >> >> This adds the following make check targets: >> >> make check-qtest-migration >> >> Signed-off-by: Fabiano Rosas <farosas@suse.de> >> --- >> I did not include check-qtest-<arch>-<subsys> because meson generates a >> long line that affects readability. > > Can you give an example of that ? I'm wondering how much of a > problem it actually is ? Personally when I'm running a subset > of tests, I almost always want to limit to just one arch target. > Ok, you have a different use case, mine is just "run migration tests for all archs, without bringing all the rest of qtest along". When I want to limit to one arch, I use the 'QTEST_QEMU_BINARY=qemu-system-<arch> migration-test' syntax. The issue is that meson always shows all suites in which a test is present (quite uselessly IMO): [1-8/8]
On Wed, Nov 06, 2024 at 09:40:21AM -0300, Fabiano Rosas wrote: > Daniel P. Berrangé <berrange@redhat.com> writes: > > > On Tue, Nov 05, 2024 at 03:08:36PM -0300, Fabiano Rosas wrote: > >> Allow qtests to be ran by subsystem. Some subsystems, such as > >> migration, have a large number of tests and we could benefit from > >> being able to access them from make check without having to run the > >> full set of qtests. > >> > >> This adds the following make check targets: > >> > >> make check-qtest-migration > >> > >> Signed-off-by: Fabiano Rosas <farosas@suse.de> > >> --- > >> I did not include check-qtest-<arch>-<subsys> because meson generates a > >> long line that affects readability. > > > > Can you give an example of that ? I'm wondering how much of a > > problem it actually is ? Personally when I'm running a subset > > of tests, I almost always want to limit to just one arch target. > > > > Ok, you have a different use case, mine is just "run migration tests for > all archs, without bringing all the rest of qtest along". When I want to > limit to one arch, I use the 'QTEST_QEMU_BINARY=qemu-system-<arch> > migration-test' syntax. > > The issue is that meson always shows all suites in which a test is > present (quite uselessly IMO): Ewwww, yes, that's pretty horrific :-( Very annoying behaviour, as it actively discourages people from adding more suites :-( I agree with your decision. > > [1-8/8]
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 806af512d0..e0ba858f5b 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -36,6 +36,13 @@ if enable_modules qtests_generic += [ 'modules-test' ] endif +qtest_subsystems = { + 'migration-test-smoke': ['migration'], + 'migration-test': ['migration'], + 'cdrom-test': ['block'], + 'ahci-test': ['block'], +} + qtests_pci = \ (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) + \ (config_all_devices.has_key('CONFIG_IVSHMEM_DEVICE') ? ['ivshmem-test'] : []) @@ -431,6 +438,12 @@ foreach dir : target_dirs test: executable(test, src, dependencies: deps) } endif + + suites = ['qtest', 'qtest-' + target_base] + foreach subsys: qtest_subsystems.get(test, []) + suites += ['qtest-' + subsys] + endforeach + test('qtest-@0@/@1@'.format(target_base, test), qtest_executables[test], depends: [test_deps, qtest_emulator, emulator_modules], @@ -439,6 +452,6 @@ foreach dir : target_dirs protocol: 'tap', timeout: slow_qtests.get(test, 60), priority: slow_qtests.get(test, 60), - suite: ['qtest', 'qtest-' + target_base]) + suite: suites) endforeach endforeach
Allow qtests to be ran by subsystem. Some subsystems, such as migration, have a large number of tests and we could benefit from being able to access them from make check without having to run the full set of qtests. This adds the following make check targets: make check-qtest-migration Signed-off-by: Fabiano Rosas <farosas@suse.de> --- I did not include check-qtest-<arch>-<subsys> because meson generates a long line that affects readability. --- tests/qtest/meson.build | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)