All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: "Alex Bennée" <alex.bennee@linaro.org>,
	qemu-devel@nongnu.org,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Cc: Ani Sinha <anisinha@redhat.com>,
	Richard Henderson <richard.henderson@linaro.org>,
	Paolo Bonzini <pbonzini@redhat.com>,
	"Daniel P . Berrange" <berrange@redhat.com>,
	John Snow <jsnow@redhat.com>
Subject: [RFC PATCH 4/8] tests/pytest: add pytest to the meson build system
Date: Thu, 11 Jul 2024 13:55:42 +0200	[thread overview]
Message-ID: <20240711115546.40859-5-thuth@redhat.com> (raw)
In-Reply-To: <20240711115546.40859-1-thuth@redhat.com>

From: Ani Sinha <ani@anisinha.ca>

Integrate the pytest framework with the meson build system. This
will make meson run all the pytests under the pytest directory.

Signed-off-by: Ani Sinha <ani@anisinha.ca>
[thuth: Removed the acpi-bits and adjusted for converted avocado tests instead]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/Makefile.include   |  4 ++-
 tests/meson.build        |  1 +
 tests/pytest/meson.build | 53 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 tests/pytest/meson.build

diff --git a/tests/Makefile.include b/tests/Makefile.include
index d39d5dd6a4..68151717d7 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -3,12 +3,14 @@
 .PHONY: check-help
 check-help:
 	@echo "Regression testing targets:"
-	@echo " $(MAKE) check                  Run block, qapi-schema, unit, softfloat, qtest and decodetree tests"
+	@echo " $(MAKE) check                  Run block, qapi-schema, unit, softfloat, qtest, pytest and decodetree tests"
 	@echo " $(MAKE) bench                  Run speed tests"
 	@echo
 	@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-pytest           Run pytest tests"
+	@echo " $(MAKE) check-pytest-TARGET    Run pytest 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"
diff --git a/tests/meson.build b/tests/meson.build
index acb6807094..17510a468e 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -85,3 +85,4 @@ subdir('unit')
 subdir('qapi-schema')
 subdir('qtest')
 subdir('migration')
+subdir('pytest')
diff --git a/tests/pytest/meson.build b/tests/pytest/meson.build
new file mode 100644
index 0000000000..1486628d45
--- /dev/null
+++ b/tests/pytest/meson.build
@@ -0,0 +1,53 @@
+slow_pytests = {
+  'mem_addr_space' : 90,
+}
+
+pytests_generic = [
+  'empty_cpu_model',
+  'info_usernet',
+  'version',
+]
+
+pytests_x86_64 = [
+  'cpu_queries',
+  'mem_addr_space',
+  'virtio_version',
+]
+
+pytest = find_program('pytest', required: false)
+if not pytest.found()
+  message('pytest not available ==> Disabled the qemu-pytests.')
+  subdir_done()
+endif
+
+foreach dir : target_dirs
+  if not dir.endswith('-softmmu')
+    continue
+  endif
+
+  target_base = dir.split('-')[0]
+  pytest_emulator = emulators['qemu-system-' + target_base]
+  target_pytests = get_variable('pytests_' + target_base, []) + pytests_generic
+
+  test_deps = roms
+  pytest_env = environment()
+  if have_tools
+    pytest_env.set('PYTEST_QEMU_IMG', './qemu-img')
+    test_deps += [qemu_img]
+  endif
+  pytest_env.set('PYTEST_QEMU_BINARY', meson.global_build_root() / 'qemu-system-' + target_base)
+  pytest_env.set('PYTEST_SOURCE_ROOT', meson.project_source_root())
+  pytest_env.set('PYTEST_BUILD_ROOT', meson.project_build_root())
+  pytest_env.set('PYTHONPATH', meson.project_source_root() / 'python')
+
+  foreach test : target_pytests
+    test('pytest-@0@/@1@'.format(target_base, test),
+         pytest,
+         depends: [test_deps, pytest_emulator, emulator_modules],
+         env: pytest_env,
+         args: [meson.current_source_dir() / 'test_' + test + '.py'],
+         timeout: slow_pytests.get(test, 60),
+         priority: slow_pytests.get(test, 60),
+         suite: ['pytest', 'pytest-' + target_base])
+  endforeach
+endforeach
-- 
2.45.2



  parent reply	other threads:[~2024-07-11 11:57 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-11 11:55 [RFC PATCH 0/8] Convert avocado tests to normal Python unittests Thomas Huth
2024-07-11 11:55 ` [RFC PATCH 1/8] tests/pytest: Add base classes for the upcoming pytest-based tests Thomas Huth
2024-07-12  8:50   ` Daniel P. Berrangé
2024-07-11 11:55 ` [RFC PATCH 2/8] tests/pytest: Convert some simple avocado tests into pytests Thomas Huth
2024-07-12  8:51   ` Daniel P. Berrangé
2024-07-11 11:55 ` [RFC PATCH 3/8] tests/pytest: Convert info_usernet and version test with small adjustments Thomas Huth
2024-07-12  8:55   ` Daniel P. Berrangé
2024-07-11 11:55 ` Thomas Huth [this message]
2024-07-12  9:01   ` [RFC PATCH 4/8] tests/pytest: add pytest to the meson build system Daniel P. Berrangé
2024-07-12 10:14     ` Thomas Huth
2024-07-12 10:26       ` Daniel P. Berrangé
2024-07-12 11:54         ` Thomas Huth
2024-07-12 11:47       ` Daniel P. Berrangé
2024-07-12 11:59         ` Thomas Huth
2024-07-11 11:55 ` [RFC PATCH 5/8] tests_pytest: Implement fetch_asset() method for downloading assets Thomas Huth
2024-07-11 16:45   ` Richard Henderson
2024-07-11 18:49     ` Richard Henderson
2024-07-11 19:23       ` Alex Bennée
2024-07-11 21:35         ` Richard Henderson
2024-07-12  4:24           ` Thomas Huth
2024-07-12  4:21       ` Thomas Huth
2024-07-12  4:18     ` Thomas Huth
2024-07-12  9:09   ` Daniel P. Berrangé
2024-07-12  9:26     ` Thomas Huth
2024-07-11 11:55 ` [RFC PATCH 6/8] tests/pytest: Convert some tests that download files via fetch_asset() Thomas Huth
2024-07-12  9:11   ` Daniel P. Berrangé
2024-07-11 11:55 ` [RFC PATCH 7/8] tests/pytest: Add a function for extracting files from an archive Thomas Huth
2024-07-12  9:14   ` Daniel P. Berrangé
2024-07-12 11:52     ` Thomas Huth
2024-07-12 11:56       ` Daniel P. Berrangé
2024-07-11 11:55 ` [RFC PATCH 8/8] tests/pytest: Convert avocado test that needed avocado.utils.archive Thomas Huth
2024-07-11 12:45 ` [RFC PATCH 0/8] Convert avocado tests to normal Python unittests Daniel P. Berrangé
2024-07-11 14:39 ` Fabiano Rosas
2024-07-11 17:44   ` Thomas Huth
2024-07-12  7:07     ` Daniel P. Berrangé
2024-07-12 14:25       ` Alex Bennée
2024-07-12 14:28         ` Daniel P. Berrangé
2024-07-16 16:45 ` John Snow
2024-07-16 18:03   ` Paolo Bonzini
2024-07-16 18:10     ` Daniel P. Berrangé
2024-07-16 19:34       ` Paolo Bonzini
2024-07-16 19:46         ` Daniel P. Berrangé
2024-07-17  7:32     ` Thomas Huth
2024-07-17  7:41       ` Paolo Bonzini
2024-07-17  6:21   ` Thomas Huth

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=20240711115546.40859-5-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=anisinha@redhat.com \
    --cc=berrange@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.