[v1] tests/docker and tests/tcg cleanup and diet

[PATCH 10/15] tests/tcg: remove CONFIG_USER_ONLY from config-target.mak

Posted by Paolo Bonzini 3 years, 8 months ago

Just check the target name instead.

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 ae8004c76e..083b09c742 100644
--- a/tests/tcg/Makefile.target
+++ b/tests/tcg/Makefile.target
@@ -32,7 +32,7 @@
 all:
 -include ../../../config-host.mak
 -include ../config-$(TARGET).mak
-ifeq ($(CONFIG_USER_ONLY),y)
+ifeq ($(filter %-softmmu, $(TARGET)),)
 -include $(SRC_PATH)/configs/targets/$(TARGET)/default.mak
 endif
 
@@ -42,7 +42,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
@@ -89,7 +89,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
@@ -151,7 +151,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 b09956c14d..a17db8ce64 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
       ;;
+    *)
+      echo "QEMU=$PWD/qemu-$arch" >> $config_target_mak
+      ;;
   esac
 
   eval "target_compiler_cflags=\${cross_cc_cflags_$arch}"
-- 
2.31.1

Re: [PATCH 10/15] tests/tcg: remove CONFIG_USER_ONLY from config-target.mak

Posted by Philippe Mathieu-Daudé 3 years, 8 months ago

On 28/3/22 16:02, Paolo Bonzini wrote:
> Just check the target name instead.
> 
> 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/configure.sh b/tests/tcg/configure.sh
> index b09956c14d..a17db8ce64 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
>         ;;
> +    *)

Can we restrict to:

        *-user)

just in case?

> +      echo "QEMU=$PWD/qemu-$arch" >> $config_target_mak
> +      ;;
>     esac

With '*-user':
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>