[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/15] tests/tcg: remove CONFIG_LINUX_USER from config-target.mak
From: |
Paolo Bonzini |
Subject: |
[PATCH 09/15] tests/tcg: remove CONFIG_LINUX_USER from config-target.mak |
Date: |
Mon, 28 Mar 2022 10:02:34 -0400 |
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
- Re: [PATCH 01/15] tests/docker: remove dead code, (continued)
- [PATCH 04/15] tests/docker: remove unnecessary default definitions, Paolo Bonzini, 2022/03/28
- [PATCH 13/15] tests/tcg: invoke Makefile.target directly from QEMU's makefile, Paolo Bonzini, 2022/03/28
- [PATCH 03/15] tests/docker: remove dead variable, Paolo Bonzini, 2022/03/28
- [PATCH 10/15] tests/tcg: remove CONFIG_USER_ONLY from config-target.mak, Paolo Bonzini, 2022/03/28
- [PATCH 06/15] tests/docker: remove unnecessary filtering of $(DOCKER_IMAGES), Paolo Bonzini, 2022/03/28
- [PATCH 07/15] tests/docker: simplify docker-TEST@IMAGE targets, Paolo Bonzini, 2022/03/28
- [PATCH 09/15] tests/tcg: remove CONFIG_LINUX_USER from config-target.mak,
Paolo Bonzini <=
- [PATCH 12/15] tests/tcg: list test targets in Makefile.prereqs, Paolo Bonzini, 2022/03/28
- [PATCH 15/15] tests/tcg: fix non-static build, Paolo Bonzini, 2022/03/28
- [PATCH 11/15] tests/tcg: prepare Makefile.prereqs at configure time, Paolo Bonzini, 2022/03/28
- Re: [PATCH 00/15] tests/docker and tests/tcg cleanup and diet, Richard Henderson, 2022/03/28