qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 11/42] tests/functional: Prepare the meson build system for the functional tests
Date: Wed,  4 Sep 2024 12:38:46 +0200	[thread overview]
Message-ID: <20240904103923.451847-12-thuth@redhat.com> (raw)
In-Reply-To: <20240904103923.451847-1-thuth@redhat.com>

Provide a meson.build file for the upcoming python-based functional
tests, and add some wrapper glue targets to the tests/Makefile.include
file. We are going to use two "speed" modes for the functional tests:
The "quick" tests can be run at any time (i.e. also during "make check"),
while the "thorough" tests should only be run when running a
"make check-functional" test run (since these tests might download
additional assets from the internet).

The changes to the meson.build files are partly based on an earlier
patch by Ani Sinha.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240830133841.142644-12-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/Makefile.include       | 11 +++++
 tests/functional/meson.build | 81 ++++++++++++++++++++++++++++++++++++
 tests/meson.build            |  1 +
 3 files changed, 93 insertions(+)
 create mode 100644 tests/functional/meson.build

diff --git a/tests/Makefile.include b/tests/Makefile.include
index fbb1a4b211..66c8cc3123 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -9,6 +9,8 @@ check-help:
 	@echo "Individual test suites:"
 	@echo " $(MAKE) check-qtest-TARGET       Run qtest tests for given target"
 	@echo " $(MAKE) check-qtest              Run qtest tests"
+	@echo " $(MAKE) check-functional         Run python-based functional tests"
+	@echo " $(MAKE) check-functional-TARGET  Run functional tests for a given target"
 	@echo " $(MAKE) check-unit               Run qobject tests"
 	@echo " $(MAKE) check-qapi-schema        Run QAPI schema tests"
 	@echo " $(MAKE) check-block              Run block tests"
@@ -152,6 +154,15 @@ check-acceptance-deprecated-warning:
 
 check-acceptance: check-acceptance-deprecated-warning | check-avocado
 
+FUNCTIONAL_TARGETS=$(patsubst %-softmmu,check-functional-%, $(filter %-softmmu,$(TARGETS)))
+.PHONY: $(FUNCTIONAL_TARGETS)
+$(FUNCTIONAL_TARGETS):
+	@$(MAKE) SPEED=thorough $(subst -functional,-func,$@)
+
+.PHONY: check-functional
+check-functional:
+	@$(MAKE) SPEED=thorough check-func check-func-quick
+
 # Consolidated targets
 
 .PHONY: check check-clean get-vm-images
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
new file mode 100644
index 0000000000..052d2e8781
--- /dev/null
+++ b/tests/functional/meson.build
@@ -0,0 +1,81 @@
+# QEMU functional tests:
+# Tests that are put in the 'quick' category are run by default during
+# 'make check'. Everything that should not be run during 'make check'
+# (e.g. tests that fetch assets from the internet) should be put into
+# the 'thorough' category instead.
+
+# Most tests run too slow with TCI enabled, so skip the functional tests there
+if get_option('tcg_interpreter')
+  subdir_done()
+endif
+
+# Timeouts for individual tests that can be slow e.g. with debugging enabled
+test_timeouts = {
+}
+
+tests_generic_system = [
+]
+
+tests_generic_linuxuser = [
+]
+
+tests_generic_bsduser = [
+]
+
+tests_x86_64_system_quick = [
+]
+
+tests_x86_64_system_thorough = [
+]
+
+foreach speed : ['quick', 'thorough']
+  foreach dir : target_dirs
+
+    target_base = dir.split('-')[0]
+
+    if dir.endswith('-softmmu')
+      sysmode = 'system'
+      test_emulator = emulators['qemu-system-' + target_base]
+    elif dir.endswith('-linux-user')
+      sysmode = 'linuxuser'
+      test_emulator = emulators['qemu-' + target_base]
+    elif dir.endswith('-bsd-user')
+      sysmode = 'bsduser'
+      test_emulator = emulators['qemu-' + target_base]
+    else
+      continue
+    endif
+
+    if speed == 'quick'
+      suites = ['func-quick', 'func-' + target_base]
+      target_tests = get_variable('tests_' + target_base + '_' + sysmode + '_quick', []) \
+                     + get_variable('tests_generic_' + sysmode)
+    else
+      suites = ['func-' + speed, 'func-' + target_base + '-' + speed, speed]
+      target_tests = get_variable('tests_' + target_base + '_' + sysmode + '_' + speed, [])
+    endif
+
+    test_deps = roms
+    test_env = environment()
+    if have_tools
+      test_env.set('QEMU_TEST_QEMU_IMG', meson.global_build_root() / 'qemu-img')
+      test_deps += [qemu_img]
+    endif
+    test_env.set('QEMU_TEST_QEMU_BINARY', test_emulator.full_path())
+    test_env.set('QEMU_BUILD_ROOT', meson.project_build_root())
+    test_env.set('PYTHONPATH', meson.project_source_root() / 'python:' +
+                               meson.current_source_dir())
+
+    foreach test : target_tests
+      test('func-@0@/@1@'.format(target_base, test),
+           python,
+           depends: [test_deps, test_emulator, emulator_modules],
+           env: test_env,
+           args: [meson.current_source_dir() / 'test_' + test + '.py'],
+           protocol: 'tap',
+           timeout: test_timeouts.get(test, 60),
+           priority: test_timeouts.get(test, 60),
+           suite: suites)
+    endforeach
+  endforeach
+endforeach
diff --git a/tests/meson.build b/tests/meson.build
index 80dd3029cf..907a4c1c98 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -85,3 +85,4 @@ subdir('unit')
 subdir('qapi-schema')
 subdir('qtest')
 subdir('migration')
+subdir('functional')
-- 
2.46.0



  parent reply	other threads:[~2024-09-04 10:40 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-04 10:38 [PULL 00/42] Introduce new functional test framework Thomas Huth
2024-09-04 10:38 ` [PULL 01/42] tests/avocado: machine aarch64: standardize location and RO access Thomas Huth
2024-09-04 10:38 ` [PULL 02/42] tests/avocado/boot_xen.py: fetch kernel during test setUp() Thomas Huth
2024-09-04 10:38 ` [PULL 03/42] tests/avocado/machine_aarch64_sbsaref.py: allow for rw usage of image Thomas Huth
2024-09-04 10:38 ` [PULL 04/42] Bump avocado to 103.0 Thomas Huth
2024-09-04 10:38 ` [PULL 05/42] tests/avocado/avocado_qemu: Fix the "from" statements in linuxtest.py Thomas Huth
2024-09-04 10:38 ` [PULL 06/42] tests/avocado/boot_linux_console: Remove the s390x subtest Thomas Huth
2024-09-04 10:38 ` [PULL 07/42] python: Install pycotap in our venv if necessary Thomas Huth
2024-09-04 10:38 ` [PULL 08/42] tests/functional: Add base classes for the upcoming pytest-based tests Thomas Huth
2024-09-04 10:38 ` [PULL 09/42] tests/functional: Set up logging Thomas Huth
2024-09-04 10:38 ` [PULL 10/42] tests/Makefile.include: Increase the level of indentation in the help text Thomas Huth
2024-09-04 10:38 ` Thomas Huth [this message]
2024-09-04 10:38 ` [PULL 12/42] tests/functional: Convert simple avocado tests into standalone python tests Thomas Huth
2024-09-04 10:38 ` [PULL 13/42] tests/functional: Convert avocado tests that just need a small adjustment Thomas Huth
2024-09-04 10:38 ` [PULL 14/42] tests/functional: add a module for handling asset download & caching Thomas Huth
2024-09-04 10:38 ` [PULL 15/42] tests/functional: enable pre-emptive caching of assets Thomas Huth
2024-11-26 16:44   ` Philippe Mathieu-Daudé
2024-11-26 16:45     ` Peter Maydell
2024-11-26 17:26       ` Daniel P. Berrangé
2024-11-26 17:31     ` Daniel P. Berrangé
2024-11-26 17:46       ` Peter Maydell
2024-11-26 17:52         ` Thomas Huth
2024-11-26 17:56           ` Daniel P. Berrangé
2024-11-26 21:17             ` Peter Maydell
2024-11-26 22:54           ` Richard Henderson
2024-11-27  6:29             ` Thomas Huth
2024-11-27 18:02               ` Richard Henderson
2024-11-28  9:54                 ` Thomas Huth
2024-11-28  9:58                   ` Daniel P. Berrangé
2024-11-27  9:06             ` Daniel P. Berrangé
2024-11-27 18:31               ` Pierrick Bouvier
2024-11-28  9:34                 ` Daniel P. Berrangé
2024-11-28 17:25                   ` Pierrick Bouvier
2024-11-28 17:57                     ` Daniel P. Berrangé
2024-09-04 10:38 ` [PULL 16/42] tests/functional: Allow asset downloading with concurrent threads Thomas Huth
2024-09-04 10:38 ` [PULL 17/42] tests/functional: Convert some tests that download files via fetch_asset() Thomas Huth
2024-09-04 10:38 ` [PULL 18/42] tests/functional: Add a function for extracting files from an archive Thomas Huth
2024-09-04 10:38 ` [PULL 19/42] tests/functional: Convert some avocado tests that needed avocado.utils.archive Thomas Huth
2024-09-04 10:38 ` [PULL 20/42] tests/functional: Convert the s390x avocado tests into standalone tests Thomas Huth
2024-09-04 10:38 ` [PULL 21/42] tests/functional: Convert the x86_cpu_model_versions test Thomas Huth
2024-09-04 10:38 ` [PULL 22/42] tests/functional: Convert the microblaze avocado tests into standalone tests Thomas Huth
2024-09-04 10:38 ` [PULL 23/42] tests/functional: Convert the virtio_gpu avocado test into a standalone test Thomas Huth
2024-09-04 10:38 ` [PULL 24/42] tests/functional: Convert most ppc avocado tests into standalone tests Thomas Huth
2024-09-04 10:39 ` [PULL 25/42] tests/functional: Convert the ppc_amiga avocado test into a standalone test Thomas Huth
2024-09-04 10:39 ` [PULL 26/42] tests/functional: Convert the ppc_hv " Thomas Huth
2024-09-04 10:39 ` [PULL 27/42] tests/functional: Convert the m68k nextcube test with tesseract Thomas Huth
2024-09-04 10:39 ` [PULL 28/42] tests/functional: Convert the acpi-bits test into a standalone test Thomas Huth
2024-09-04 10:39 ` [PULL 29/42] tests/functional: Convert the rx_gdbsim avocado " Thomas Huth
2024-09-04 10:39 ` [PULL 30/42] tests/functional: Convert the linux_initrd " Thomas Huth
2024-09-04 10:39 ` [PULL 31/42] tests/functional: Convert ARM Integrator/CP avocado tests Thomas Huth
2024-09-04 10:39 ` [PULL 32/42] tests/functional: Convert Aarch64 SBSA-Ref " Thomas Huth
2024-09-04 10:39 ` [PULL 33/42] tests/functional: Convert Aarch64 Virt machine " Thomas Huth
2024-09-04 10:39 ` [PULL 34/42] tests/functional: Convert mips64el Fuloong2e avocado test (1/2) Thomas Huth
2024-09-04 10:39 ` [PULL 35/42] tests/functional: Add QemuUserTest class Thomas Huth
2024-09-04 10:39 ` [PULL 36/42] tests/functional: Convert ARM bFLT linux-user avocado test Thomas Huth
2024-09-04 10:39 ` [PULL 37/42] tests/avocado: Remove unused QemuUserTest class Thomas Huth
2024-09-04 10:39 ` [PULL 38/42] gitlab-ci: Add "check-functional" to the build tests Thomas Huth
2024-09-04 10:39 ` [PULL 39/42] docs/devel: Split testing docs from the build docs and move to separate folder Thomas Huth
2024-09-04 10:39 ` [PULL 40/42] docs/devel/testing: Split the Avocado documentation into a separate file Thomas Huth
2024-09-04 10:39 ` [PULL 41/42] docs/devel/testing: Rename avocado_qemu.Test class Thomas Huth
2024-09-04 10:39 ` [PULL 42/42] docs/devel/testing: Add documentation for functional tests Thomas Huth
2024-09-06 11:32 ` [PULL 00/42] Introduce new functional test framework Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240904103923.451847-12-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).