TARGET_DIRS reflects what we wanted to configure which in the normal
case is all our targets. However once meson has pared-down our target
list due to missing features we need to check the final list of
ninja-targets. This prevents check-tcg barfing on a --disable-tcg
build.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 Makefile               | 3 +++
 tests/Makefile.include | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index a380bbfa12..a25b2a5431 100644
--- a/Makefile
+++ b/Makefile
@@ -174,6 +174,9 @@ ifneq ($(filter $(ninja-targets), $(ninja-cmd-goals)),)
 endif
 endif
 
+# Build up our target list from the filtered list of ninja targets
+TARGETS=$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targets)))
+
 # Force configure to re-run if the API symbols are updated
 ifeq ($(CONFIG_PLUGIN),y)
 config-host.mak: $(SRC_PATH)/plugins/qemu-plugins.symbols
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 3ce8b03f34..ee438f8d6d 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -41,10 +41,9 @@ SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
 SPEED = quick
 
 # Per guest TCG tests
-
-BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS))
-CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TARGET_DIRS))
-RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TARGET_DIRS))
+BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TARGETS))
+CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TARGETS))
+RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TARGETS))
 
 # Probe for the Docker Builds needed for each build
 $(foreach PROBE_TARGET,$(TARGET_DIRS), 				\
-- 
2.20.1

On 26/01/21 15:53, Alex Bennée wrote:
> TARGET_DIRS reflects what we wanted to configure which in the normal
> case is all our targets. However once meson has pared-down our target
> list due to missing features we need to check the final list of
> ninja-targets. This prevents check-tcg barfing on a --disable-tcg
> build.
> 
> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   Makefile               | 3 +++
>   tests/Makefile.include | 7 +++----
>   2 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index a380bbfa12..a25b2a5431 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -174,6 +174,9 @@ ifneq ($(filter $(ninja-targets), $(ninja-cmd-goals)),)
>   endif
>   endif
>   
> +# Build up our target list from the filtered list of ninja targets
> +TARGETS=$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targets)))

I wouldn't mind having this directly in tests/Makefile.include, if you 
don't expect any other uses.

Apart from this nit, series

Acked-by: Paolo Bonzini <pbonzini@redhat.com>

Paolo

>   # Force configure to re-run if the API symbols are updated
>   ifeq ($(CONFIG_PLUGIN),y)
>   config-host.mak: $(SRC_PATH)/plugins/qemu-plugins.symbols
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 3ce8b03f34..ee438f8d6d 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -41,10 +41,9 @@ SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
>   SPEED = quick
>   
>   # Per guest TCG tests
> -
> -BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS))
> -CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TARGET_DIRS))
> -RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TARGET_DIRS))
> +BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TARGETS))
> +CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TARGETS))
> +RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TARGETS))
>   
>   # Probe for the Docker Builds needed for each build
>   $(foreach PROBE_TARGET,$(TARGET_DIRS), 				\
>