[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/6] tests/vm: Add libslirp to the VM tests
From: |
Thomas Huth |
Subject: |
[PATCH 2/6] tests/vm: Add libslirp to the VM tests |
Date: |
Wed, 24 Aug 2022 17:11:18 +0200 |
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
- [PATCH v2 for-7.2 0/6] Drop libslirp submodule, Thomas Huth, 2022/08/24
- [PATCH 1/6] tests/docker: Update the debian-all-test-cross container to Debian 11, Thomas Huth, 2022/08/24
- [PATCH 2/6] tests/vm: Add libslirp to the VM tests,
Thomas Huth <=
- [PATCH 3/6] tests/lcitool/libvirt-ci: Update the lcitool module to the latest version, Thomas Huth, 2022/08/24
- [PATCH 5/6] tests/avocado: Do not run tests that require libslirp if it is not available, Thomas Huth, 2022/08/24
- [PATCH 4/6] tests: Refresh dockerfiles and FreeBSD vars with lcitool, Thomas Huth, 2022/08/24
- [PATCH v2 6/6] Remove the slirp submodule (i.e. compile only with an external libslirp), Thomas Huth, 2022/08/24
- Re: [PATCH v2 for-7.2 0/6] Drop libslirp submodule, Samuel Thibault, 2022/08/24