From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Richard Henderson <richard.henderson@linaro.org>
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PULL 7/8] tests/vm/freebsd: Get up-to-date package list from lcitool vars file
Date: Tue, 18 Jul 2023 11:30:39 +0200 [thread overview]
Message-ID: <20230718093040.172145-8-thuth@redhat.com> (raw)
In-Reply-To: <20230718093040.172145-1-thuth@redhat.com>
From: Philippe Mathieu-Daudé <philmd@linaro.org>
Get an up-to-date package list from lcitool, that way we
don't need to manually keep this array in sync.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Inspired-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230711144922.67491-5-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/vm/freebsd | 42 ++----------------------------------------
1 file changed, 2 insertions(+), 40 deletions(-)
diff --git a/tests/vm/freebsd b/tests/vm/freebsd
index 11de6473f4..ac51376c82 100755
--- a/tests/vm/freebsd
+++ b/tests/vm/freebsd
@@ -31,45 +31,6 @@ class FreeBSDVM(basevm.BaseVM):
link = "https://download.freebsd.org/releases/CI-IMAGES/13.2-RELEASE/amd64/Latest/FreeBSD-13.2-RELEASE-amd64-BASIC-CI.raw.xz"
csum = "a4fb3b6c7b75dd4d58fb0d75e4caf72844bffe0ca00e66459c028b198ffb3c0e"
size = "20G"
- pkgs = [
- # build tools
- "git",
- "pkgconf",
- "bzip2",
- "python39",
- "ninja",
-
- # gnu tools
- "bash",
- "gmake",
- "gsed",
- "gettext",
-
- # libs: crypto
- "gnutls",
-
- # libs: images
- "jpeg-turbo",
- "png",
-
- # libs: ui
- "sdl2",
- "gtk3",
- "libxkbcommon",
-
- # libs: opengl
- "libepoxy",
- "mesa-libs",
-
- # libs: migration
- "zstd",
-
- # libs: networking
- "libslirp",
-
- # libs: sndio
- "sndio",
- ]
BUILD_SCRIPT = """
set -e;
@@ -151,8 +112,9 @@ class FreeBSDVM(basevm.BaseVM):
self.console_wait(prompt)
self.console_send("echo 'chmod 666 /dev/vtbd1' >> /etc/rc.local\n")
+ pkgs = self.get_qemu_packages_from_lcitool_json()
self.print_step("Installing packages")
- self.ssh_root_check("pkg install -y %s\n" % " ".join(self.pkgs))
+ self.ssh_root_check("pkg install -y %s\n" % " ".join(pkgs))
# shutdown
self.ssh_root(self.poweroff)
--
2.39.3
next prev 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 ` [PULL 4/8] tests/lcitool: Generate distribution packages list in JSON format Thomas Huth
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 ` Thomas Huth [this message]
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-8-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=berrange@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 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).