From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
"Samuel Thibault" <samuel.thibault@ens-lyon.org>
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Warner Losh" <imp@bsdimp.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Daniel P . Berrange" <berrange@redhat.com>
Subject: [PATCH 2/6] tests/vm: Add libslirp to the VM tests
Date: Wed, 24 Aug 2022 17:11:18 +0200 [thread overview]
Message-ID: <20220824151122.704946-3-thuth@redhat.com> (raw)
In-Reply-To: <20220824151122.704946-1-thuth@redhat.com>
We are going to remove the slirp submodule from the QEMU repository, so
we should make sure to install the distro's libslirp to get the same
test coverage as before in the VMs.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/vm/freebsd | 3 +++
tests/vm/haiku.x86_64 | 3 ++-
tests/vm/netbsd | 3 +++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/tests/vm/freebsd b/tests/vm/freebsd
index cd1fabde52..3643fe325d 100755
--- a/tests/vm/freebsd
+++ b/tests/vm/freebsd
@@ -63,6 +63,9 @@ class FreeBSDVM(basevm.BaseVM):
# libs: migration
"zstd",
+
+ # libs: networking
+ "libslirp",
]
BUILD_SCRIPT = """
diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64
index 936f7d2ae2..29668bc272 100755
--- a/tests/vm/haiku.x86_64
+++ b/tests/vm/haiku.x86_64
@@ -71,6 +71,7 @@ class HaikuVM(basevm.BaseVM):
"devel:libpixman_1",
"devel:libpng16",
"devel:libsdl2_2.0",
+ "devel:libslirp",
"devel:libsnappy",
"devel:libssh2",
"devel:libtasn1",
@@ -89,7 +90,7 @@ class HaikuVM(basevm.BaseVM):
mkdir -p /usr/bin
ln -s /boot/system/bin/env /usr/bin/env
cd ../build
- ../src/configure --disable-slirp {configure_opts};
+ ../src/configure {configure_opts};
make --output-sync -j{jobs} {target} {verbose};
"""
diff --git a/tests/vm/netbsd b/tests/vm/netbsd
index aa883ec23c..da6773ff59 100755
--- a/tests/vm/netbsd
+++ b/tests/vm/netbsd
@@ -54,6 +54,9 @@ class NetBSDVM(basevm.BaseVM):
# libs: migration
"zstd",
+
+ # libs: networking
+ "libslirp",
]
BUILD_SCRIPT = """
--
2.31.1
next prev parent reply other threads:[~2022-08-24 15:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-24 15:11 [PATCH v2 for-7.2 0/6] Drop libslirp submodule Thomas Huth
2022-08-24 15:11 ` [PATCH 1/6] tests/docker: Update the debian-all-test-cross container to Debian 11 Thomas Huth
2022-08-24 15:11 ` Thomas Huth [this message]
2022-08-24 15:11 ` [PATCH 3/6] tests/lcitool/libvirt-ci: Update the lcitool module to the latest version Thomas Huth
2022-08-24 15:11 ` [PATCH 4/6] tests: Refresh dockerfiles and FreeBSD vars with lcitool Thomas Huth
2022-08-24 15:11 ` [PATCH 5/6] tests/avocado: Do not run tests that require libslirp if it is not available Thomas Huth
2022-08-24 15:11 ` [PATCH v2 6/6] Remove the slirp submodule (i.e. compile only with an external libslirp) Thomas Huth
2022-08-24 19:46 ` [PATCH v2 for-7.2 0/6] Drop libslirp submodule Samuel Thibault
2022-09-30 16:50 ` Christian Schoenebeck
2022-09-30 17:27 ` 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=20220824151122.704946-3-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=f4bug@amsat.org \
--cc=imp@bsdimp.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=samuel.thibault@ens-lyon.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).