[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/17] tests/tcg: remove CONFIG_USER_ONLY from config-target.mak
From: |
Paolo Bonzini |
Subject: |
[PATCH 11/17] tests/tcg: remove CONFIG_USER_ONLY from config-target.mak |
Date: |
Fri, 1 Apr 2022 16:13:20 +0200 |
Just check the target name instead.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220328140240.40798-11-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/tcg/Makefile.target | 8 ++++----
tests/tcg/configure.sh | 12 +++---------
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target
index acda5bcec2..c75e8d983f 100644
--- a/tests/tcg/Makefile.target
+++ b/tests/tcg/Makefile.target
@@ -34,7 +34,7 @@ all:
-include ../config-$(TARGET).mak
# Get semihosting definitions for user-mode emulation
-ifeq ($(CONFIG_USER_ONLY),y)
+ifeq ($(filter %-softmmu, $(TARGET)),)
-include $(SRC_PATH)/configs/targets/$(TARGET).mak
endif
@@ -44,7 +44,7 @@ COMMA := ,
quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1))
# $1 = test name, $2 = cmd, $3 = desc
-ifdef CONFIG_USER_ONLY
+ifeq ($(filter %-softmmu, $(TARGET)),)
run-test = $(call quiet-command, timeout --foreground $(TIMEOUT) $2 > $1.out, \
"TEST",$3)
else
@@ -91,7 +91,7 @@ QEMU_OPTS=
# 90s with --enable-tcg-interpreter
TIMEOUT=90
-ifdef CONFIG_USER_ONLY
+ifeq ($(filter %-softmmu, $(TARGET)),)
# The order we include is important. We include multiarch first and
# then the target. If there are common tests shared between
# sub-targets (e.g. ARM & AArch64) then it is up to
@@ -153,7 +153,7 @@ extract-plugin = $(wordlist 2, 2, $(subst -with-, ,$1))
RUN_TESTS+=$(EXTRA_RUNS)
-ifdef CONFIG_USER_ONLY
+ifeq ($(filter %-softmmu, $(TARGET)),)
run-%: %
$(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)")
diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
index 57026b5899..0d864c24fc 100755
--- a/tests/tcg/configure.sh
+++ b/tests/tcg/configure.sh
@@ -225,18 +225,12 @@ for target in $target_list; do
echo "TARGET_NAME=$arch" >> $config_target_mak
echo "target=$target" >> $config_target_mak
case $target in
- *-linux-user)
- echo "CONFIG_USER_ONLY=y" >> $config_target_mak
- echo "QEMU=$PWD/qemu-$arch" >> $config_target_mak
- ;;
- *-bsd-user)
- echo "CONFIG_USER_ONLY=y" >> $config_target_mak
- echo "QEMU=$PWD/qemu-$arch" >> $config_target_mak
- ;;
*-softmmu)
- echo "CONFIG_SOFTMMU=y" >> $config_target_mak
echo "QEMU=$PWD/qemu-system-$arch" >> $config_target_mak
;;
+ *-linux-user|*-bsd-user)
+ echo "QEMU=$PWD/qemu-$arch" >> $config_target_mak
+ ;;
esac
eval "target_compiler_cflags=\${cross_cc_cflags_$arch}"
--
2.35.1
- [PATCH 00/17] tests/docker and tests/tcg cleanup and diet, Paolo Bonzini, 2022/04/01
- [PATCH 01/17] tests/docker: remove dead code for linux-user containers, Paolo Bonzini, 2022/04/01
- [PATCH 02/17] tests/docker: remove test targets, Paolo Bonzini, 2022/04/01
- [PATCH 03/17] tests/docker: remove dead variable, Paolo Bonzini, 2022/04/01
- [PATCH 04/17] tests/docker: remove unnecessary default definitions, Paolo Bonzini, 2022/04/01
- [PATCH 06/17] tests/docker: remove unnecessary filtering of $(DOCKER_IMAGES), Paolo Bonzini, 2022/04/01
- [PATCH 05/17] tests/docker: inline variable definitions or move close to use, Paolo Bonzini, 2022/04/01
- [PATCH 07/17] tests/docker: simplify docker-TEST@IMAGE targets, Paolo Bonzini, 2022/04/01
- [PATCH 09/17] tests/tcg: add compiler test variables when using containers, Paolo Bonzini, 2022/04/01
- [PATCH 10/17] tests/tcg: remove CONFIG_LINUX_USER from config-target.mak, Paolo Bonzini, 2022/04/01
- [PATCH 11/17] tests/tcg: remove CONFIG_USER_ONLY from config-target.mak,
Paolo Bonzini <=
- [PATCH 08/17] tests/docker: do not duplicate rules for hexagon-cross, Paolo Bonzini, 2022/04/01
- [PATCH 12/17] tests/tcg: prepare Makefile.prereqs at configure time, Paolo Bonzini, 2022/04/01
- [PATCH 13/17] tests/tcg: list test targets in Makefile.prereqs, Paolo Bonzini, 2022/04/01
- [PATCH 15/17] tests/tcg: isolate from QEMU's config-host.mak, Paolo Bonzini, 2022/04/01
- [PATCH 16/17] tests/docker: remove SKIP_DOCKER_BUILD, Paolo Bonzini, 2022/04/01
- [PATCH 17/17] tests/tcg: fix non-static build, Paolo Bonzini, 2022/04/01
- [PATCH 14/17] tests/tcg: invoke Makefile.target directly from QEMU's makefile, Paolo Bonzini, 2022/04/01
- Re: [PATCH 00/17] tests/docker and tests/tcg cleanup and diet, Alex Bennée, 2022/04/11