[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/23] tests/vm: Add libslirp to the VM tests
From: |
Thomas Huth |
Subject: |
[PULL 17/23] tests/vm: Add libslirp to the VM tests |
Date: |
Tue, 30 Aug 2022 20:40:06 +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.
Message-Id: <20220824151122.704946-3-thuth@redhat.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
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
- [PULL 02/23] tests/qtest: Use g_mkdtemp(), (continued)
- [PULL 02/23] tests/qtest: Use g_mkdtemp(), Thomas Huth, 2022/08/30
- [PULL 04/23] tests/qtest: migration-test: Handle link() for win32, Thomas Huth, 2022/08/30
- [PULL 05/23] backends/tpm: Exclude headers and macros that don't exist on win32, Thomas Huth, 2022/08/30
- [PULL 09/23] tests/qtest: i440fx-test: Skip running request_{bios, pflash} for win32, Thomas Huth, 2022/08/30
- [PULL 03/23] tests: Use g_mkdir_with_parents(), Thomas Huth, 2022/08/30
- [PULL 06/23] tests/qtest: Adapt {m48t59,rtc}-test cases for win32, Thomas Huth, 2022/08/30
- [PULL 10/23] tests/qtest: migration-test: Skip running test_migrate_fd_proto on win32, Thomas Huth, 2022/08/30
- [PULL 08/23] tests/qtest: Build cases that use memory-backend-file for posix only, Thomas Huth, 2022/08/30
- [PULL 11/23] tests/qtest: libqos: Drop inclusion of <sys/wait.h>, Thomas Huth, 2022/08/30
- [PULL 07/23] tests/qtest: Build e1000e-test for posix only, Thomas Huth, 2022/08/30
- [PULL 17/23] tests/vm: Add libslirp to the VM tests,
Thomas Huth <=
- [PULL 19/23] tests/avocado: Fix trivial typo, Thomas Huth, 2022/08/30
- [PULL 01/23] tests/qtest: Use g_setenv(), Thomas Huth, 2022/08/30
- [PULL 18/23] tests/avocado: Do not run tests that require libslirp if it is not available, Thomas Huth, 2022/08/30
- [PULL 21/23] gitlab-ci: Only use one process in Windows jobs for compilation, Thomas Huth, 2022/08/30
- [PULL 22/23] tests/qtest/ac97-test: Correct reference to driver, Thomas Huth, 2022/08/30
- [PULL 12/23] tests/qtest: libqos: Rename malloc.h to libqos-malloc.h, Thomas Huth, 2022/08/30
- [PULL 14/23] tests/qtest: machine-none-test: Use double quotes to pass the cpu option, Thomas Huth, 2022/08/30
- [PULL 13/23] tests/qtest: device-plug-test: Reverse the usage of double/single quotes, Thomas Huth, 2022/08/30
- [PULL 15/23] tests/qtest: npcm7xx_emc-test: Skip running test_{tx, rx} on win32, Thomas Huth, 2022/08/30
- [PULL 16/23] tests/qtest: prom-env-test: Use double quotes to pass the prom-env option, Thomas Huth, 2022/08/30