In the next commits, we'll port each architecture from Makefile to meson, and it's easier to review those changes if we remove Makefiles step by step.
Signed-off-by: Pierrick Bouvier <[email protected]> --- tests/tcg/Makefile.target | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 1b83824ff4e..836fccaca23 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -105,7 +105,9 @@ ifeq ($(filter %-softmmu, $(TARGET)),) # $(TARGET_NAME)/Makefile.target to include the common parent # architecture in its VPATH. However some targets are so minimal we # can't even build the multiarch tests. -ifneq ($(filter $(TARGET_NAME),aarch64_be),) +ifeq ($(wildcard $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.target),) +# skip user tests if Makefile.target is not present +else ifneq ($(filter $(TARGET_NAME),aarch64_be),) -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.target else -include $(SRC_PATH)/tests/tcg/multiarch/Makefile.target @@ -135,7 +137,11 @@ ifneq ($(filter $(TARGET_NAME),$(MULTIARCH_SOFTMMU_TARGETS)),) -include $(SRC_PATH)/tests/tcg/minilib/Makefile.target -include $(SRC_PATH)/tests/tcg/multiarch/system/Makefile.softmmu-target endif +ifeq ($(wildcard $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.softmmu-target),) +# skip system tests if Makefile.target is not present +else -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.softmmu-target +endif endif -- 2.47.3
