diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-04-19 10:10:08 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2022-04-20 16:04:20 +0100 |
| commit | 3996dab2beadecd5cf57a7b2515f88e572b7fbd5 (patch) | |
| tree | 0b01973f2ca641608968b010a34ff55f20b9dee5 | |
| parent | f084839aba566b4a5199c461df4ba93b0e43580a (diff) | |
| download | qemu-3996dab2beadecd5cf57a7b2515f88e572b7fbd5.zip qemu-3996dab2beadecd5cf57a7b2515f88e572b7fbd5.tar.gz qemu-3996dab2beadecd5cf57a7b2515f88e572b7fbd5.tar.bz2 | |
tests/tcg: remove CONFIG_LINUX_USER from config-target.mak
Just check the target name instead.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220401141326.1244422-11-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220419091020.3008144-14-alex.bennee@linaro.org>
| -rwxr-xr-x | tests/tcg/configure.sh | 2 | ||||
| -rw-r--r-- | tests/tcg/multiarch/Makefile.target | 2 | ||||
| -rw-r--r-- | 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 8927a2b..57026b5 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 dec401e..6bba523 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 17cf168..f9fcd31 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 |