SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests/tcg: remove CONFIG_USER_ONLY from config-target.mak

Browse Source 
Just check the target name instead.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220401141326.1244422-12-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-15-alex.bennee@linaro.org>
This commit is contained in:
Paolo Bonzini 2022-04-19 10:10:09 +01:00 committed by Alex Bennée
parent 3996dab2be
commit 8e61ecca4a
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/tcg/Makefile.target
View File

@ -34,7 +34,7 @@ all:
-include ../config-$(TARGET).mak -include ../config-$(TARGET).mak
# Get semihosting definitions for user-mode emulation # Get semihosting definitions for user-mode emulation
ifeq ($(CONFIG_USER_ONLY),y) ifeq ($(filter %-softmmu, $(TARGET)),)
-include $(SRC_PATH)/configs/targets/$(TARGET).mak -include $(SRC_PATH)/configs/targets/$(TARGET).mak
endif endif
@ -44,7 +44,7 @@ COMMA := ,
quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1))
# $1 = test name, $2 = cmd, $3 = desc # $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, \ run-test = $(call quiet-command, timeout --foreground $(TIMEOUT) $2 > $1.out, \
"TEST",$3) "TEST",$3)
else else
@ -91,7 +91,7 @@ QEMU_OPTS=
# 90s with --enable-tcg-interpreter # 90s with --enable-tcg-interpreter
TIMEOUT=90 TIMEOUT=90
ifdef CONFIG_USER_ONLY ifeq ($(filter %-softmmu, $(TARGET)),)
# The order we include is important. We include multiarch first and # The order we include is important. We include multiarch first and
# then the target. If there are common tests shared between # then the target. If there are common tests shared between
# sub-targets (e.g. ARM & AArch64) then it is up to # 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) RUN_TESTS+=$(EXTRA_RUNS)
ifdef CONFIG_USER_ONLY ifeq ($(filter %-softmmu, $(TARGET)),)
run-%: % run-%: %
$(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)") $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)")

12
tests/tcg/configure.sh
View File

@ -225,18 +225,12 @@ for target in $target_list; do
echo "TARGET_NAME=$arch" >> $config_target_mak echo "TARGET_NAME=$arch" >> $config_target_mak
echo "target=$target" >> $config_target_mak echo "target=$target" >> $config_target_mak
case $target in 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) *-softmmu)
echo "CONFIG_SOFTMMU=y" >> $config_target_mak
echo "QEMU=$PWD/qemu-system-$arch" >> $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 esac
eval "target_compiler_cflags=\${cross_cc_cflags_$arch}" eval "target_compiler_cflags=\${cross_cc_cflags_$arch}"