[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 54/55] configure: move tests/qemu-iotests/common.env generation to
From: |
Paolo Bonzini |
Subject: |
[PULL 54/55] configure: move tests/qemu-iotests/common.env generation to meson |
Date: |
Mon, 21 Dec 2020 15:44:46 +0100 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 7 -------
tests/qemu-iotests/common.env.in | 3 +++
tests/qemu-iotests/meson.build | 3 +++
3 files changed, 6 insertions(+), 7 deletions(-)
create mode 100644 tests/qemu-iotests/common.env.in
diff --git a/configure b/configure
index 63ac12d5b8..c8e30ba1c7 100755
--- a/configure
+++ b/configure
@@ -6394,13 +6394,6 @@ for rom in seabios; do
echo "RANLIB=$ranlib" >> $config_mak
done
-# set up qemu-iotests in this build directory
-iotests_common_env="tests/qemu-iotests/common.env"
-
-echo "# Automatically generated by configure - do not modify" >
"$iotests_common_env"
-echo >> "$iotests_common_env"
-echo "export PYTHON='$python'" >> "$iotests_common_env"
-
if test "$skip_meson" = no; then
cross="config-meson.cross.new"
meson_quote() {
diff --git a/tests/qemu-iotests/common.env.in b/tests/qemu-iotests/common.env.in
new file mode 100644
index 0000000000..e565cdf40c
--- /dev/null
+++ b/tests/qemu-iotests/common.env.in
@@ -0,0 +1,3 @@
+# Automatically generated by configure - do not modify
+
+export PYTHON='@PYTHON@'
diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build
index 67aed1e492..26658ce25c 100644
--- a/tests/qemu-iotests/meson.build
+++ b/tests/qemu-iotests/meson.build
@@ -3,3 +3,6 @@ if 'CONFIG_LINUX' in config_host
else
socket_scm_helper = []
endif
+configure_file(output: 'common.env',
+ input: files('common.env.in'),
+ configuration: {'PYTHON': python.full_path()})
--
2.29.2
- [PULL 23/55] util: Extract flush_icache_range to cacheflush.c, (continued)
- [PULL 23/55] util: Extract flush_icache_range to cacheflush.c, Paolo Bonzini, 2020/12/21
- [PULL 34/55] configure: accept --enable-slirp, Paolo Bonzini, 2020/12/21
- [PULL 28/55] meson: fix detection of curses with pkgconfig, Paolo Bonzini, 2020/12/21
- [PULL 26/55] meson: update submodule to 0.56.0, Paolo Bonzini, 2020/12/21
- [PULL 22/55] remove TCG includes from common code, Paolo Bonzini, 2020/12/21
- [PULL 41/55] libiscsi: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 42/55] libnfs: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 45/55] lzo: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 53/55] meson.build: convert --with-default-devices to meson, Paolo Bonzini, 2020/12/21
- [PULL 52/55] libattr: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 54/55] configure: move tests/qemu-iotests/common.env generation to meson,
Paolo Bonzini <=
- [PULL 46/55] snappy: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 51/55] cap_ng: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 44/55] rbd: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 47/55] lzfse: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 49/55] seccomp: convert to meson, Paolo Bonzini, 2020/12/21