[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/7] tests/tcg: remove -f from Makefile invocation
From: |
Paolo Bonzini |
Subject: |
[PATCH 7/7] tests/tcg: remove -f from Makefile invocation |
Date: |
Tue, 7 Jun 2022 11:40:31 +0200 |
Name the symbolic link "Makefile" and place it in the target subdirectory.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 3 ++-
tests/Makefile.include | 7 +++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 9d49ea4c5b..f35847c3cd 100755
--- a/configure
+++ b/configure
@@ -2224,7 +2224,6 @@ fi
# tests might fail. Prefer to keep the relevant files in their own
# directory and symlink the directory instead.
LINKS="Makefile"
-LINKS="$LINKS tests/tcg/Makefile.target"
LINKS="$LINKS pc-bios/optionrom/Makefile"
LINKS="$LINKS pc-bios/s390-ccw/Makefile"
LINKS="$LINKS pc-bios/vof/Makefile"
@@ -2483,6 +2482,7 @@ fi
# tests/tcg configuration
(config_host_mak=tests/tcg/config-host.mak
+mkdir -p tests/tcg
echo "# Automatically generated by configure - do not modify" >
$config_host_mak
echo "SRC_PATH=$source_path" >> $config_host_mak
echo "HOST_CC=$host_cc" >> $config_host_mak
@@ -2600,6 +2600,7 @@ for target in $target_list; do
fi
if test $got_cross_cc = yes; then
mkdir -p tests/tcg/$target
+ ln -sf $source_path/tests/tcg/Makefile.target tests/tcg/$target/Makefile
ln -sf ../config-$target.mak tests/tcg/$target/config-target.mak
echo "TARGET=$target" >> $config_target_mak
echo "QEMU=$PWD/$qemu" >> $config_target_mak
diff --git a/tests/Makefile.include b/tests/Makefile.include
index f2182ead1e..8f44a20da3 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -47,20 +47,19 @@ $(foreach TARGET,$(TCG_TESTS_TARGETS), \
.PHONY: $(TCG_TESTS_TARGETS:%=build-tcg-tests-%)
$(TCG_TESTS_TARGETS:%=build-tcg-tests-%): build-tcg-tests-%:
$(BUILD_DIR)/tests/tcg/config-%.mak
$(call quiet-command, \
- $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS),
\
+ $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS), \
"BUILD","$* guest-tests")
.PHONY: $(TCG_TESTS_TARGETS:%=run-tcg-tests-%)
$(TCG_TESTS_TARGETS:%=run-tcg-tests-%): run-tcg-tests-%: build-tcg-tests-%
$(call quiet-command, \
- $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \
- SPEED=$(SPEED) run, \
+ $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS) SPEED=$(SPEED) run, \
"RUN", "$* guest-tests")
.PHONY: $(TCG_TESTS_TARGETS:%=clean-tcg-tests-%)
$(TCG_TESTS_TARGETS:%=clean-tcg-tests-%): clean-tcg-tests-%:
$(call quiet-command, \
- $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS)
clean, \
+ $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS) clean, \
"CLEAN", "$* guest-tests")
.PHONY: build-tcg
--
2.36.1
- [PATCH 0/7] More tests/tcg cleanups, Paolo Bonzini, 2022/06/07
- [PATCH 3/7] configure: allow more host/target combos to use the host compiler, Paolo Bonzini, 2022/06/07
- [PATCH 4/7] configure: move tests/tcg/Makefile.prereqs to root build directory, Paolo Bonzini, 2022/06/07
- [PATCH 6/7] tests: simplify Makefile invocation for tests/tcg, Paolo Bonzini, 2022/06/07
- [PATCH 5/7] configure: store container engine in config-host.mak, Paolo Bonzini, 2022/06/07
- [PATCH 2/7] build: include pc-bios/ part in the ROMS variable, Paolo Bonzini, 2022/06/07
- [PATCH 1/7] meson: put cross compiler info in a separate section, Paolo Bonzini, 2022/06/07
- [PATCH 7/7] tests/tcg: remove -f from Makefile invocation,
Paolo Bonzini <=
- Re: [PATCH 0/7] More tests/tcg cleanups, Paolo Bonzini, 2022/06/07