[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 27/51] configure: cleanup creation of tests/tcg target config
From: |
Alex Bennée |
Subject: |
[PATCH v1 27/51] configure: cleanup creation of tests/tcg target config |
Date: |
Thu, 29 Sep 2022 12:42:07 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
Remove the symlink to tests/tcg/config-*.mak, which is possible now
that unused target config files are not created either.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
configure | 12 +++++-------
Makefile | 2 +-
meson.build | 2 +-
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/configure b/configure
index 8b495d4453..c175650eb9 100755
--- a/configure
+++ b/configure
@@ -2540,10 +2540,6 @@ tcg_tests_targets=
for target in $target_list; do
arch=${target%%-*}
- config_target_mak=tests/tcg/config-$target.mak
-
- echo "# Automatically generated by configure - do not modify" >
$config_target_mak
- echo "TARGET_NAME=$arch" >> "$config_target_mak"
case $target in
xtensa*-linux-user)
# the toolchain is not complete with headers, only build softmmu tests
@@ -2560,13 +2556,15 @@ for target in $target_list; do
if probe_target_compiler $target || test -n "$container_image"; then
test -n "$container_image" && build_static=y
- write_target_makefile "build-tcg-tests-$target >> "$config_target_mak"
mkdir -p "tests/tcg/$target"
+ config_target_mak=tests/tcg/$target/config-target.mak
ln -sf "$source_path/tests/tcg/Makefile.target"
"tests/tcg/$target/Makefile"
- ln -sf "../config-$target.mak" "tests/tcg/$target/config-target.mak"
+ echo "# Automatically generated by configure - do not modify" >
"$config_target_mak"
+ echo "TARGET_NAME=$arch" >> "$config_target_mak"
echo "TARGET=$target" >> "$config_target_mak"
- echo "QEMU=$PWD/$qemu" >> "$config_target_mak"
+ write_target_makefile "build-tcg-tests-$target" >> "$config_target_mak"
echo "BUILD_STATIC=$build_static" >> "$config_target_mak"
+ echo "QEMU=$PWD/$qemu" >> "$config_target_mak"
echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs
tcg_tests_targets="$tcg_tests_targets $target"
fi
diff --git a/Makefile b/Makefile
index 357592ad39..a48103cc8a 100644
--- a/Makefile
+++ b/Makefile
@@ -221,7 +221,7 @@ qemu-%.tar.bz2:
distclean: clean recurse-distclean
-$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g ||
:
rm -f config-host.mak Makefile.prereqs qemu-bundle
- rm -f tests/tcg/config-*.mak
+ rm -f tests/tcg/*/config-target.mak tests/tcg/config-host.mak
rm -f config.status
rm -f roms/seabios/config.mak
rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols
diff --git a/meson.build b/meson.build
index 8dc661363f..ac5ef05c21 100644
--- a/meson.build
+++ b/meson.build
@@ -3738,7 +3738,7 @@ summary(summary_info, bool_yn: true, section:
'Compilation')
summary_info = {}
have_cross = false
foreach target: target_dirs
- tcg_mak = meson.current_build_dir() / 'tests/tcg' / 'config-' + target +
'.mak'
+ tcg_mak = meson.current_build_dir() / 'tests/tcg' / target /
'config-target.mak'
if fs.exists(tcg_mak)
config_cross_tcg = keyval.load(tcg_mak)
if 'CC' in config_cross_tcg
--
2.34.1
- [PATCH v1 28/51] configure: build ROMs with container-based cross compilers, (continued)
- [PATCH v1 28/51] configure: build ROMs with container-based cross compilers, Alex Bennée, 2022/09/29
- [PATCH v1 09/51] tests/docker: update fedora-win[32|64]-cross with lcitool, Alex Bennée, 2022/09/29
- [PATCH v1 13/51] pc-bios/optionrom: detect CC options just once, Alex Bennée, 2022/09/29
- [PATCH v1 15/51] vof: add distclean target, Alex Bennée, 2022/09/29
- [PATCH v1 19/51] tests: simplify Makefile invocation for tests/tcg, Alex Bennée, 2022/09/29
- [PATCH v1 36/51] plugins: Assert mmu_idx in range before use in qemu_plugin_get_hwaddr, Alex Bennée, 2022/09/29
- [PATCH v1 38/51] docs/devel: move API to end of tcg-plugins.rst, Alex Bennée, 2022/09/29
- [PATCH v1 34/51] disas: use result of ->read_memory_func, Alex Bennée, 2022/09/29
- [PATCH v1 43/51] gdbstub: move sstep flags probing into AccelClass, Alex Bennée, 2022/09/29
- [PATCH v1 25/51] configure: move tests/tcg/Makefile.prereqs to root build directory, Alex Bennée, 2022/09/29
- [PATCH v1 27/51] configure: cleanup creation of tests/tcg target config,
Alex Bennée <=
- [PATCH v1 24/51] tests/tcg: move compiler tests to Makefiles, Alex Bennée, 2022/09/29
- [PATCH v1 29/51] pc-bios/optionrom: Adopt meson style Make output, Alex Bennée, 2022/09/29
- [PATCH v1 17/51] configure: return status code from probe_target_compiler, Alex Bennée, 2022/09/29
- [PATCH v1 21/51] tests/tcg: add distclean rule, Alex Bennée, 2022/09/29
- [PATCH v1 49/51] contrib/gitdm: add WANG Xuerui to individual contributers, Alex Bennée, 2022/09/29
- [PATCH v1 23/51] tests/tcg: clean up calls to run-test, Alex Bennée, 2022/09/29
- [PATCH v1 47/51] contrib/gitdm: add mapping for Loongson Technology, Alex Bennée, 2022/09/29
- [PATCH v1 18/51] configure: store container engine in config-host.mak, Alex Bennée, 2022/09/29
- [PATCH v1 20/51] tests/tcg: remove -f from Makefile invocation, Alex Bennée, 2022/09/29
- [PATCH v1 48/51] contrib/gitdm: add Paul to individual contributors, Alex Bennée, 2022/09/29