[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RFC 2/6] build, tests: Add qemu in-tree packages to pyvenv at con
From: |
John Snow |
Subject: |
[PATCH RFC 2/6] build, tests: Add qemu in-tree packages to pyvenv at configure time. |
Date: |
Tue, 20 Jun 2023 20:21:17 -0400 |
though, ouch: on my machine this takes 3-4 entire seconds to do. I wish
it wasn't so slow, but we can't rely on these packages not having any
dependencies any more.
We could theoretically use a .pth hack when creating the venv to
automatically include this directory as an "installed packages"
location, but when we go to drop qemu.qmp in the future, that will break
- I think we need to *install* this package.
Signed-off-by: John Snow <jsnow@redhat.com>
---
configure | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/configure b/configure
index 01a53576a7..d2e0abc068 100755
--- a/configure
+++ b/configure
@@ -250,6 +250,7 @@ git_submodules_action="update"
git="git"
debug_tcg="no"
docs="auto"
+tests="enabled"
EXESUF=""
prefix="/usr/local"
qemu_suffix="qemu"
@@ -639,6 +640,10 @@ for opt do
;;
--disable-docs) docs=disabled
;;
+ --enable-tests) tests=enabled
+ ;;
+ --disable-tests) tests=disabled
+ ;;
--cpu=*)
;;
--target-list=*) target_list="$optarg"
@@ -985,6 +990,32 @@ if test "$docs" != "disabled" ; then
fi
fi
+# Optionally pre-load the testing pre-requisites. This is for iotests,
+# vmtests, and anything else that uses Python qemu.* packages. Note that
+# our in-tree qemu packages are currently pure python with zero external
+# dependencies. For this reason, it excludes the Avocado dependencies
+# which are installed on-demand at time of use instead.
+
+mkvenv_flags=""
+if test "$pypi" = "enabled" ; then
+ mkvenv_flags="--online"
+fi
+
+if test "$tests" = "enabled" ; then
+ if ! $mkvenv install \
+ $mkvenv_flags \
+ --editable \
+ --dir "${source_path}/python/wheels" \
+ "${source_path}/python/";
+ then
+ echo "There was a problem installing the in-tree python packages for
testing."
+ exit 1
+ fi
+ touch pyvenv/tests.group
+fi
+
+echo "mkvenv: done for now, ciao!"
+
# Probe for ninja
if test -z "$ninja"; then
--
2.40.1
- [PATCH RFC 0/6] Switch iotests to pyvenv, John Snow, 2023/06/20
- [PATCH RFC 2/6] build, tests: Add qemu in-tree packages to pyvenv at configure time.,
John Snow <=
- [PATCH RFC 1/6] experiment: add mkvenv install, John Snow, 2023/06/20
- [PATCH RFC 5/6] iotests: use pyvenv/bin/python3 to launch child test processes, John Snow, 2023/06/20
- [PATCH RFC 3/6] iotests: get rid of '..' in path environment output, John Snow, 2023/06/20
- [PATCH RFC 6/6] iotests: don't add qemu.git/python to PYTHONPATH, John Snow, 2023/06/20
- [PATCH RFC 4/6] iotests: use the correct python to run linters, John Snow, 2023/06/20
- Re: [PATCH RFC 0/6] Switch iotests to pyvenv, Paolo Bonzini, 2023/06/21