[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 16/20] configure: cleanup creation of tests/tcg target config
From: |
Paolo Bonzini |
Subject: |
[PATCH 16/20] configure: cleanup creation of tests/tcg target config |
Date: |
Fri, 26 Aug 2022 00:27:41 +0200 |
Remove the symlink to tests/tcg/config-*.mak, which is possible now
that unused target config files are not created anymore.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 2 +-
configure | 12 +++++-------
meson.build | 2 +-
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 6fd5b6ac06..adf24c0236 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/configure b/configure
index 37ddd90bb1..97665ef619 100755
--- a/configure
+++ b/configure
@@ -2567,10 +2567,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
@@ -2587,13 +2583,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/meson.build b/meson.build
index 8e927fc457..5cfb352d45 100644
--- a/meson.build
+++ b/meson.build
@@ -3812,7 +3812,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.37.1
- [PATCH 08/20] tests: simplify Makefile invocation for tests/tcg, (continued)
- [PATCH 08/20] tests: simplify Makefile invocation for tests/tcg, Paolo Bonzini, 2022/08/25
- [PATCH 09/20] tests/tcg: remove -f from Makefile invocation, Paolo Bonzini, 2022/08/25
- [PATCH 10/20] tests/tcg: add distclean rule, Paolo Bonzini, 2022/08/25
- [PATCH 11/20] tests/tcg: unify ppc64 and ppc64le Makefiles, Paolo Bonzini, 2022/08/25
- [PATCH 12/20] tests/tcg: clean up calls to run-test, Paolo Bonzini, 2022/08/25
- [PATCH 13/20] tests/tcg: move compiler tests to Makefiles, Paolo Bonzini, 2022/08/25
- [PATCH 14/20] configure: move tests/tcg/Makefile.prereqs to root build directory, Paolo Bonzini, 2022/08/25
- [PATCH 15/20] configure: unify creation of cross-compilation Makefiles, Paolo Bonzini, 2022/08/25
- [PATCH 17/20] configure: build ROMs with container-based cross compilers, Paolo Bonzini, 2022/08/25
- [PATCH 18/20] pc-bios/optionrom: Adopt meson style Make output, Paolo Bonzini, 2022/08/25
- [PATCH 16/20] configure: cleanup creation of tests/tcg target config,
Paolo Bonzini <=
- [PATCH 19/20] pc-bios/s390-ccw: Adopt meson style Make output, Paolo Bonzini, 2022/08/25
- [PATCH 20/20] pc-bios/vof: Adopt meson style Make output, Paolo Bonzini, 2022/08/25