From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: alex.bennee@linaro.org
Subject: [PATCH 09/15] tests/tcg: remove CONFIG_LINUX_USER from config-target.mak
Date: Mon, 28 Mar 2022 10:02:34 -0400 [thread overview]
Message-ID: <20220328140240.40798-10-pbonzini@redhat.com> (raw)
In-Reply-To: <20220328140240.40798-1-pbonzini@redhat.com>
Just check the target name instead.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/tcg/configure.sh | 2 --
tests/tcg/multiarch/Makefile.target | 2 +-
tests/tcg/x86_64/Makefile.target | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
index 0162b2f6c4..b09956c14d 100755
--- a/tests/tcg/configure.sh
+++ b/tests/tcg/configure.sh
@@ -227,12 +227,10 @@ for target in $target_list; do
case $target in
*-linux-user)
echo "CONFIG_USER_ONLY=y" >> $config_target_mak
- echo "CONFIG_LINUX_USER=y" >> $config_target_mak
echo "QEMU=$PWD/qemu-$arch" >> $config_target_mak
;;
*-bsd-user)
echo "CONFIG_USER_ONLY=y" >> $config_target_mak
- echo "CONFIG_BSD_USER=y" >> $config_target_mak
echo "QEMU=$PWD/qemu-$arch" >> $config_target_mak
;;
*-softmmu)
diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target
index dec401e67f..6bba523729 100644
--- a/tests/tcg/multiarch/Makefile.target
+++ b/tests/tcg/multiarch/Makefile.target
@@ -10,7 +10,7 @@ MULTIARCH_SRC=$(SRC_PATH)/tests/tcg/multiarch
# Set search path for all sources
VPATH += $(MULTIARCH_SRC)
MULTIARCH_SRCS = $(notdir $(wildcard $(MULTIARCH_SRC)/*.c))
-ifneq ($(CONFIG_LINUX_USER),)
+ifeq ($(filter %-linux-user, $(TARGET)),$(TARGET))
VPATH += $(MULTIARCH_SRC)/linux
MULTIARCH_SRCS += $(notdir $(wildcard $(MULTIARCH_SRC)/linux/*.c))
endif
diff --git a/tests/tcg/x86_64/Makefile.target b/tests/tcg/x86_64/Makefile.target
index 17cf168f0a..f9fcd31caf 100644
--- a/tests/tcg/x86_64/Makefile.target
+++ b/tests/tcg/x86_64/Makefile.target
@@ -8,7 +8,7 @@
include $(SRC_PATH)/tests/tcg/i386/Makefile.target
-ifneq ($(CONFIG_LINUX_USER),)
+ifeq ($(filter %-linux-user, $(TARGET)),$(TARGET))
X86_64_TESTS += vsyscall
TESTS=$(MULTIARCH_TESTS) $(X86_64_TESTS) test-x86_64
else
--
2.31.1
next prev parent reply other threads:[~2022-03-28 14:13 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-28 14:02 [PATCH 00/15] tests/docker and tests/tcg cleanup and diet Paolo Bonzini
2022-03-28 14:02 ` [PATCH 01/15] tests/docker: remove dead code Paolo Bonzini
2022-03-28 16:18 ` Alex Bennée
2022-03-28 17:31 ` Paolo Bonzini
2022-03-28 14:02 ` [PATCH 02/15] tests/docker: remove test targets Paolo Bonzini
2022-03-28 16:44 ` Alex Bennée
2022-03-28 17:31 ` Paolo Bonzini
2022-03-28 14:02 ` [PATCH 03/15] tests/docker: remove dead variable Paolo Bonzini
2022-03-28 16:45 ` Alex Bennée
2022-03-28 14:02 ` [PATCH 04/15] tests/docker: remove unnecessary default definitions Paolo Bonzini
2022-03-30 16:32 ` Alex Bennée
2022-03-28 14:02 ` [PATCH 05/15] tests/docker: inline variable definitions or move close to use Paolo Bonzini
2022-03-28 14:02 ` [PATCH 06/15] tests/docker: remove unnecessary filtering of $(DOCKER_IMAGES) Paolo Bonzini
2022-03-28 14:02 ` [PATCH 07/15] tests/docker: simplify docker-TEST@IMAGE targets Paolo Bonzini
2022-03-28 22:34 ` Philippe Mathieu-Daudé
2022-03-28 14:02 ` [PATCH 08/15] tests/tcg: add compiler test variables when using containers Paolo Bonzini
2022-03-28 16:48 ` Alex Bennée
2022-03-28 14:02 ` Paolo Bonzini [this message]
2022-03-28 22:35 ` [PATCH 09/15] tests/tcg: remove CONFIG_LINUX_USER from config-target.mak Philippe Mathieu-Daudé
2022-03-28 14:02 ` [PATCH 10/15] tests/tcg: remove CONFIG_USER_ONLY " Paolo Bonzini
2022-03-28 22:37 ` Philippe Mathieu-Daudé
2022-03-28 14:02 ` [PATCH 11/15] tests/tcg: prepare Makefile.prereqs at configure time Paolo Bonzini
2022-03-28 14:02 ` [PATCH 12/15] tests/tcg: list test targets in Makefile.prereqs Paolo Bonzini
2022-03-28 14:02 ` [PATCH 13/15] tests/tcg: invoke Makefile.target directly from QEMU's makefile Paolo Bonzini
2022-03-28 14:02 ` [PATCH 14/15] tests/docker: remove SKIP_DOCKER_BUILD Paolo Bonzini
2022-03-28 14:02 ` [PATCH 15/15] tests/tcg: fix non-static build Paolo Bonzini
2022-03-28 15:53 ` [PATCH 00/15] tests/docker and tests/tcg cleanup and diet Richard Henderson
2022-03-28 17:30 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220328140240.40798-10-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).