qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Richard Henderson <richard.henderson@linaro.org>
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Erik Skultety" <eskultet@redhat.com>,
	"Daniel P . Berrangé" <berrange@redhat.com>,
	"Warner Losh" <imp@bsdimp.com>
Subject: [PULL 4/8] tests/lcitool: Generate distribution packages list in JSON format
Date: Tue, 18 Jul 2023 11:30:36 +0200	[thread overview]
Message-ID: <20230718093040.172145-5-thuth@redhat.com> (raw)
In-Reply-To: <20230718093040.172145-1-thuth@redhat.com>

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Add the generate_pkglist() helper to generate a list of packages
required by a distribution to build QEMU.

Since we can not add a "THIS FILE WAS AUTO-GENERATED" comment in
JSON, create the files under tests/vm/generated/ sub-directory;
add a README mentioning the files are generated.

Suggested-by: Erik Skultety <eskultet@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Message-Id: <20230711144922.67491-2-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/lcitool/refresh     | 11 +++++++++++
 tests/vm/generated/README |  5 +++++
 2 files changed, 16 insertions(+)
 create mode 100644 tests/vm/generated/README

diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index b54566edcc..4584870ea1 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -84,6 +84,12 @@ def generate_cirrus(target, trailer=None):
     generate(filename, cmd, trailer)
 
 
+def generate_pkglist(vm, target):
+    filename = Path(src_dir, "tests", "vm", "generated", vm + ".json")
+    cmd = lcitool_cmd + ["variables", "--format", "json", target, "qemu"]
+    generate(filename, cmd, None)
+
+
 # Netmap still needs to be manually built as it is yet to be packaged
 # into a distro. We also add cscope and gtags which are used in the CI
 # test
@@ -191,6 +197,11 @@ try:
     generate_cirrus("freebsd-13")
     generate_cirrus("macos-12")
 
+    #
+    # VM packages lists
+    #
+    generate_pkglist("freebsd", "freebsd-13")
+
     sys.exit(0)
 except Exception as ex:
     print(str(ex), file=sys.stderr)
diff --git a/tests/vm/generated/README b/tests/vm/generated/README
new file mode 100644
index 0000000000..7ccc6ffd3d
--- /dev/null
+++ b/tests/vm/generated/README
@@ -0,0 +1,5 @@
+# FILES IN THIS FOLDER WERE AUTO-GENERATED
+#
+#  $ make lcitool-refresh
+#
+# https://gitlab.com/libvirt/libvirt-ci
-- 
2.39.3



  parent reply	other threads:[~2023-07-18  9:32 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-18  9:30 [PULL 0/8] s390x, qtest and misc patches for QEMU 8.1 rc1 Thomas Huth
2023-07-18  9:30 ` [PULL 1/8] s390x: Fix QEMU abort by selecting S390_FLIC_KVM Thomas Huth
2023-07-18  9:30 ` [PULL 2/8] linux-user/elfload: Fix /proc/cpuinfo features: on s390x Thomas Huth
2023-07-18  9:30 ` [PULL 3/8] tests/qtest: Fix typo in multifd cancel test Thomas Huth
2023-07-18  9:30 ` Thomas Huth [this message]
2023-07-18  9:30 ` [PULL 5/8] tests/lcitool: Refresh generated files Thomas Huth
2023-07-18  9:30 ` [PULL 6/8] tests/vm: Introduce get_qemu_packages_from_lcitool_json() helper Thomas Huth
2023-07-18  9:30 ` [PULL 7/8] tests/vm/freebsd: Get up-to-date package list from lcitool vars file Thomas Huth
2023-07-18  9:30 ` [PULL 8/8] tests/avocado: Disable the test_sbsaref_edk2_firmware by default Thomas Huth
2023-07-19 12:40 ` [PULL 0/8] s390x, qtest and misc patches for QEMU 8.1 rc1 Peter Maydell
2023-07-19 15:05   ` Philippe Mathieu-Daudé

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=20230718093040.172145-5-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=berrange@redhat.com \
    --cc=eskultet@redhat.com \
    --cc=imp@bsdimp.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 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).