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>,
	Peter Maydell <peter.maydell@linaro.org>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Subject: [PULL 17/23] tests/vm: Add libslirp to the VM tests
Date: Tue, 30 Aug 2022 20:40:06 +0200	[thread overview]
Message-ID: <20220830184012.77978-18-thuth@redhat.com> (raw)
In-Reply-To: <20220830184012.77978-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.

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



  parent reply	other threads:[~2022-08-30 18:49 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-30 18:39 [PULL 00/23] First testing patches for QEMU 7.2 Thomas Huth
2022-08-30 18:39 ` [PULL 01/23] tests/qtest: Use g_setenv() Thomas Huth
2022-08-30 18:39 ` [PULL 02/23] tests/qtest: Use g_mkdtemp() Thomas Huth
2022-08-30 18:39 ` [PULL 03/23] tests: Use g_mkdir_with_parents() Thomas Huth
2022-08-30 18:39 ` [PULL 04/23] tests/qtest: migration-test: Handle link() for win32 Thomas Huth
2022-08-30 18:39 ` [PULL 05/23] backends/tpm: Exclude headers and macros that don't exist on win32 Thomas Huth
2022-08-30 18:39 ` [PULL 06/23] tests/qtest: Adapt {m48t59,rtc}-test cases for win32 Thomas Huth
2022-08-30 18:39 ` [PULL 07/23] tests/qtest: Build e1000e-test for posix only Thomas Huth
2022-08-30 18:39 ` [PULL 08/23] tests/qtest: Build cases that use memory-backend-file " Thomas Huth
2022-08-30 18:39 ` [PULL 09/23] tests/qtest: i440fx-test: Skip running request_{bios, pflash} for win32 Thomas Huth
2022-08-30 18:39 ` [PULL 10/23] tests/qtest: migration-test: Skip running test_migrate_fd_proto on win32 Thomas Huth
2022-08-30 18:40 ` [PULL 11/23] tests/qtest: libqos: Drop inclusion of <sys/wait.h> Thomas Huth
2022-08-30 18:40 ` [PULL 12/23] tests/qtest: libqos: Rename malloc.h to libqos-malloc.h Thomas Huth
2022-08-30 18:40 ` [PULL 13/23] tests/qtest: device-plug-test: Reverse the usage of double/single quotes Thomas Huth
2022-08-30 18:40 ` [PULL 14/23] tests/qtest: machine-none-test: Use double quotes to pass the cpu option Thomas Huth
2022-08-30 18:40 ` [PULL 15/23] tests/qtest: npcm7xx_emc-test: Skip running test_{tx, rx} on win32 Thomas Huth
2022-08-30 18:40 ` [PULL 16/23] tests/qtest: prom-env-test: Use double quotes to pass the prom-env option Thomas Huth
2022-08-30 18:40 ` Thomas Huth [this message]
2022-08-30 18:40 ` [PULL 18/23] tests/avocado: Do not run tests that require libslirp if it is not available Thomas Huth
2022-08-30 18:40 ` [PULL 19/23] tests/avocado: Fix trivial typo Thomas Huth
2022-08-30 18:40 ` [PULL 20/23] docs/devel/testing: fix minor typo Thomas Huth
2022-08-30 18:40 ` [PULL 21/23] gitlab-ci: Only use one process in Windows jobs for compilation Thomas Huth
2022-08-30 18:40 ` [PULL 22/23] tests/qtest/ac97-test: Correct reference to driver Thomas Huth
2022-08-30 18:40 ` [PULL 23/23] tests/avocado/migration: Get find_free_port() from the ports Thomas Huth
2022-08-31 23:54 ` [PULL 00/23] First testing patches for QEMU 7.2 Stefan Hajnoczi

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=20220830184012.77978-18-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.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).