diff options
| author | Paolo Bonzini | 2020-12-14 12:12:10 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2021-01-06 10:21:20 +0100 |
| commit | acb1e6db849151ef6e271027904b6cfea2d5880c (patch) | |
| tree | 991e05896180d35e5e681722c186cea1d22a10c6 | |
| parent | meson.build: convert --with-default-devices to meson (diff) | |
| download | qemu-acb1e6db849151ef6e271027904b6cfea2d5880c.tar.gz qemu-acb1e6db849151ef6e271027904b6cfea2d5880c.tar.xz qemu-acb1e6db849151ef6e271027904b6cfea2d5880c.zip | |
configure: move tests/qemu-iotests/common.env generation to meson
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | tests/qemu-iotests/common.env.in | 3 | ||||
| -rw-r--r-- | tests/qemu-iotests/meson.build | 3 |
3 files changed, 6 insertions, 7 deletions
@@ -6433,13 +6433,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()}) |